Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: update tokio to 1.40 and release 1.2.1 #107

Merged
merged 1 commit into from
Oct 7, 2024
+8 −8
Merged

build: update tokio to 1.40 and release 1.2.1 #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ members = ["abci", "proto-compiler", "proto"]
[workspace.package]

rust-version = "1.80"
version = "1.1.0"
version = "1.2.1+1.3.0"
6 changes: 3 additions & 3 deletions abci/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ url = { version = "2.5.0" }
semver = { version = "1.0.22" }
lhash = { version = "1.1.0", features = ["sha256"], optional = true }
hex = { version = "0.4.3" }
tokio-util = { version = "0.7.10", features = [
tokio-util = { version = "0.7.12", features = [
"net",
"codec",
], default-features = false, optional = true }
tokio = { version = "1.37.0", features = [
tokio = { version = "1.40", features = [
"net",
"io-util",
"rt-multi-thread",
Expand All @@ -79,7 +79,7 @@ bincode = { version = "2.0.0-rc.3" }
blake2 = { version = "0.10.6" }
bollard = { version = "0.17" }
futures = { version = "0.3.30" }
tokio = { version = "1.39", features = ["macros", "signal", "time", "io-std"] }
tokio = { version = "1.40", features = ["macros", "signal", "time", "io-std"] }
hex = { version = "0.4.3" }
lazy_static = { version = "1.4.0" }
pollster = { version = "0.3.0" }
8 changes: 4 additions & 4 deletions scripts/release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,20 +86,20 @@ if [ $VERBOSE -eq 1 ]; then
set -x
fi

rs_tenderdash_abci_version="${rs_tenderdash_abci_version#v}+${td_version}" # remove 'v' if it exists and suffix build mtd
rs_tenderdash_abci_version_build="${rs_tenderdash_abci_version#v}+${td_version}" # remove 'v' if it exists and suffix build mtd

echo "INFO: Preparing release of rs-tenderdash-abci version $rs_tenderdash_abci_version with Tenderdash version $td_version"
echo "INFO: Preparing release of rs-tenderdash-abci version $rs_tenderdash_abci_version_build with Tenderdash version $td_version"

echo INFO: Update the version in the Cargo.toml files.

set -ex
# Update the version in the Cargo.toml files.
sed -i "s/^version = .*/version = \"$rs_tenderdash_abci_version\"/" ./Cargo.toml
sed -i "s/^version = .*/version = \"$rs_tenderdash_abci_version_build\"/" ./Cargo.toml
sed -i "s/^\s*const DEFAULT_VERSION: &str = \".*\";/const DEFAULT_VERSION: \&str = \"v$td_version\";/" ./proto/build.rs
cargo fmt -- ./proto/build.rs 2>/dev/null

if [ -d "$PLATFORM_DIR" ]; then
rs_tenderdash="git = \"https:\/\/github.com\/dashpay\/rs-tenderdash-abci\", version = \"$rs_tenderdash_abci_version\", tag = \"v$rs_tenderdash_abci_version\""
rs_tenderdash="git = \"https:\/\/github.com\/dashpay\/rs-tenderdash-abci\", version = \"$rs_tenderdash_abci_version\", tag = \"v$rs_tenderdash_abci_version_build\""
echo "INFO: Updating references to tenderdash-abci / tenderdash-proto in $PLATFORM_DIR"

sed -i "s/^tenderdash-abci = { git = .*, version = [^,\}]*, tag = [^,\}]*/tenderdash-abci = { $rs_tenderdash/" "${PLATFORM_DIR}"/packages/*/Cargo.toml
Expand Down
Loading