From 9583bd93e6b73034357efd5bd51ebe70e7c1e30e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Zemanovi=C4=8D?= Date: Fri, 29 Nov 2024 11:32:39 +0000 Subject: [PATCH 1/8] add a different release config for apps --- crates/apps/release.toml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 crates/apps/release.toml diff --git a/crates/apps/release.toml b/crates/apps/release.toml new file mode 100644 index 0000000000..1534c4c1e9 --- /dev/null +++ b/crates/apps/release.toml @@ -0,0 +1,7 @@ +allow-branch = ["main", "maint-*"] +consolidate-commits = true +pre-release-commit-message = "Namada {{version}}" +publish = false +push = false +shared-version = false +tag = false From 942e8328eb1b18aef6e3fe16a455db7f6c39dac2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Zemanovi=C4=8D?= Date: Fri, 29 Nov 2024 11:34:16 +0000 Subject: [PATCH 2/8] add different commit msg for libs release --- release.toml | 2 +- wasm/release.toml | 2 +- wasm_for_tests/release.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/release.toml b/release.toml index 632e36bc02..55b34cd88b 100644 --- a/release.toml +++ b/release.toml @@ -1,6 +1,6 @@ allow-branch = ["main", "maint-*"] consolidate-commits = true -pre-release-commit-message = "Namada {{version}}" +pre-release-commit-message = "Namada libs {{version}}" publish = false push = false shared-version = true diff --git a/wasm/release.toml b/wasm/release.toml index dbacf2cec3..af34e3c3d6 100644 --- a/wasm/release.toml +++ b/wasm/release.toml @@ -1,6 +1,6 @@ allow-branch = ["main", "maint-*"] consolidate-commits = true -pre-release-commit-message = "fixup! Namada {{version}}" +pre-release-commit-message = "fixup! Namada libs {{version}}" publish = false push = false shared-version = true diff --git a/wasm_for_tests/release.toml b/wasm_for_tests/release.toml index 3a264faa08..c60a08039e 100644 --- a/wasm_for_tests/release.toml +++ b/wasm_for_tests/release.toml @@ -1,6 +1,6 @@ allow-branch = ["main", "maint-*"] consolidate-commits = true -pre-release-commit-message = "fixup! Namada {{version}}" +pre-release-commit-message = "fixup! Namada libs {{version}}" publish = false push = false shared-version = true From 6acf34b1f7fdd5c07fc7d9a163981f7d22bedde0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Zemanovi=C4=8D?= Date: Fri, 29 Nov 2024 11:35:15 +0000 Subject: [PATCH 3/8] mv scripts/release.sh scripts/release_libs.sh --- scripts/{release.sh => release_libs.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename scripts/{release.sh => release_libs.sh} (100%) diff --git a/scripts/release.sh b/scripts/release_libs.sh similarity index 100% rename from scripts/release.sh rename to scripts/release_libs.sh From 7c4c35c128b39783844a395bbd400adcf5e3d5a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Zemanovi=C4=8D?= Date: Fri, 29 Nov 2024 14:57:06 +0000 Subject: [PATCH 4/8] prefix libs release tag with "libs-" --- scripts/release_libs.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/release_libs.sh b/scripts/release_libs.sh index 3c12c2c425..a2fb077077 100755 --- a/scripts/release_libs.sh +++ b/scripts/release_libs.sh @@ -15,7 +15,7 @@ if [ "$REPO_ROOT" != "$PWD" ]; then fi VERSION="$1" -TAG_NAME="v$1" +TAG_NAME="libs-v$1" # prefixed to distinguish from bins release # start from a clean build git clean -fxd @@ -23,7 +23,7 @@ git clean -fxd # update the main workspace crate versions (1 commit) HASH_BEFORE=$(git rev-parse HEAD) cargo release version --execute $VERSION -git commit -am "Namada $VERSION" +git commit -am "Namada libs $VERSION" HASH_AFTER=$(git rev-parse HEAD) # update the wasm workspace crate versions (1 fixup) From 32f464b70cb1e084a909606279a828ba9c7edfe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Zemanovi=C4=8D?= Date: Fri, 29 Nov 2024 14:57:57 +0000 Subject: [PATCH 5/8] add a script to release apps bins --- scripts/release_bins.sh | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100755 scripts/release_bins.sh diff --git a/scripts/release_bins.sh b/scripts/release_bins.sh new file mode 100755 index 0000000000..c5a6e89dd1 --- /dev/null +++ b/scripts/release_bins.sh @@ -0,0 +1,41 @@ +#!/bin/sh +# depends on cargo-release 0.24.4, git 2.24.0 or later, unclog 0.5.0 +set -e + +if [ -z "$1" ]; then + echo "please specify a version to release" + exit 1 +fi + +REPO_ROOT=$(git rev-parse --show-toplevel) + +if [ "$REPO_ROOT" != "$PWD" ]; then + echo "please run from repository root" + exit 1 +fi + +VERSION="$1" +TAG_NAME="v$1" + +# start from a clean build +git clean -fxd + +# update the apps crate versions (1 commit) +HASH_BEFORE=$(git rev-parse HEAD) +cd $REPO_ROOT/crates/apps +cargo release version --execute $VERSION +git commit -am "Namada $VERSION" +HASH_AFTER=$(git rev-parse HEAD) + +# update the changelog (1 fixup) +cd $REPO_ROOT +unclog release $TAG_NAME +unclog build > CHANGELOG.md +git add .changelog CHANGELOG.md +git commit --fixup=$HASH_AFTER + +# show the user the result +git rebase --interactive --autosquash --keep-base $HASH_BEFORE + +echo "final $TAG_NAME commit ready for testing" + From af3f91c3db51231b15549bf1c72606cacaf07376 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Zemanovi=C4=8D?= Date: Fri, 29 Nov 2024 15:21:25 +0000 Subject: [PATCH 6/8] apps: don't use workspace version anymore --- crates/apps/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/apps/Cargo.toml b/crates/apps/Cargo.toml index 0f9d0a0873..c8b8fb6136 100644 --- a/crates/apps/Cargo.toml +++ b/crates/apps/Cargo.toml @@ -11,7 +11,7 @@ keywords.workspace = true license.workspace = true readme.workspace = true repository.workspace = true -version.workspace = true +version = "0.46.0" # Namada CLI that aggregates some common commands for the node and the client [[bin]] From 9f817f01d25bc5127babf4c1ff179a0447cd632a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Zemanovi=C4=8D?= Date: Fri, 29 Nov 2024 15:32:56 +0000 Subject: [PATCH 7/8] exclude apps crate from libs release --- scripts/release_libs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/release_libs.sh b/scripts/release_libs.sh index a2fb077077..9b509649d9 100755 --- a/scripts/release_libs.sh +++ b/scripts/release_libs.sh @@ -22,7 +22,7 @@ git clean -fxd # update the main workspace crate versions (1 commit) HASH_BEFORE=$(git rev-parse HEAD) -cargo release version --execute $VERSION +cargo release version --exclude namada_apps --execute $VERSION git commit -am "Namada libs $VERSION" HASH_AFTER=$(git rev-parse HEAD) From 63dae40fe1e8cf131d2d1138b4ce435fa105fee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Zemanovi=C4=8D?= Date: Fri, 29 Nov 2024 16:30:28 +0000 Subject: [PATCH 8/8] changelog: add #4117 --- .changelog/unreleased/miscellaneous/4117-split-release.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changelog/unreleased/miscellaneous/4117-split-release.md diff --git a/.changelog/unreleased/miscellaneous/4117-split-release.md b/.changelog/unreleased/miscellaneous/4117-split-release.md new file mode 100644 index 0000000000..320b7c29ff --- /dev/null +++ b/.changelog/unreleased/miscellaneous/4117-split-release.md @@ -0,0 +1,5 @@ +- Starting from the next release the Namada binary apps (`namada`, `namadan`, + `namadac` and `namadaw`) will be versioned separately from the libaries + (everything else including the wasm). The libraries releases will have their + tag prefixed with "lib-" and will continue with the current versioning scheme. + ([\#4117](https://github.com/anoma/namada/pull/4117)) \ No newline at end of file