From 39985f7f12e734a6c66924a3869ec0ced076db2b Mon Sep 17 00:00:00 2001 From: Connor Barr Date: Sat, 4 Jan 2025 11:25:42 +0000 Subject: [PATCH] build: version changes --- .cargo/config.toml | 6 +++- .github/workflows/release-changed-crates.yml | 30 +++++++++++++++++++ Cargo.lock | 16 +++++----- .../andromeda-set-amount-splitter/Cargo.toml | 2 +- .../finance/andromeda-splitter/Cargo.toml | 2 +- .../Cargo.toml | 2 +- contracts/math/andromeda-distance/Cargo.toml | 2 +- contracts/modules/andromeda-rates/Cargo.toml | 2 +- .../andromeda-auction/Cargo.toml | 2 +- contracts/os/andromeda-adodb/src/tests.rs | 2 +- contracts/os/andromeda-kernel/Cargo.toml | 2 +- packages/andromeda-testing-e2e/Cargo.toml | 2 +- packages/andromeda-testing/Cargo.toml | 2 +- packages/deploy/Cargo.toml | 2 +- packages/std/Cargo.toml | 2 +- scripts/detect_changed_crates.sh | 22 ++++++++++++++ tests-integration/tests/splitter.rs | 2 +- 17 files changed, 78 insertions(+), 22 deletions(-) create mode 100644 .github/workflows/release-changed-crates.yml create mode 100755 scripts/detect_changed_crates.sh diff --git a/.cargo/config.toml b/.cargo/config.toml index 2d24ac450..4f565a6f9 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -2,4 +2,8 @@ wasm = "build --release --target wasm32-unknown-unknown" unit-test = "test --lib" schema = "run --example schema" -lint = "clippy --all --all-targets -- -D warnings" \ No newline at end of file +lint = "clippy --all --all-targets -- -D warnings" + +[release] +pre-release-commit-message = "chore: bump pre-release version" +pre-release-replace = true diff --git a/.github/workflows/release-changed-crates.yml b/.github/workflows/release-changed-crates.yml new file mode 100644 index 000000000..160853987 --- /dev/null +++ b/.github/workflows/release-changed-crates.yml @@ -0,0 +1,30 @@ +name: Release Changed Crates + +on: + push: + branches: [main] + +jobs: + release: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + + - name: Detect Changed Crates + run: | + chmod +x scripts/detect_changed_crates.sh + CHANGED_CRATES=$(./scripts/detect_changed_crates.sh) + echo "Changed crates: $CHANGED_CRATES" + echo "changed_crates=$CHANGED_CRATES" >> $GITHUB_ENV + + - name: Install cargo-release + run: cargo install cargo-release + + - name: Release Changed Crates with Pre-release Tags + run: | + for crate in ${{ env.changed_crates }}; do + echo "Releasing $crate with pre-release tag 'b'" + cd $crate + cargo release pre --pre-release b --no-publish + cd - + done diff --git a/Cargo.lock b/Cargo.lock index 78e4e6bae..ca46c97a3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -148,7 +148,7 @@ dependencies = [ [[package]] name = "andromeda-auction" -version = "2.2.5-b.1" +version = "2.2.5-beta.1" dependencies = [ "andromeda-app", "andromeda-non-fungible-tokens", @@ -437,7 +437,7 @@ dependencies = [ [[package]] name = "andromeda-distance" -version = "0.1.0-b.1" +version = "0.1.0-beta.1" dependencies = [ "andromeda-app", "andromeda-math", @@ -605,7 +605,7 @@ dependencies = [ [[package]] name = "andromeda-kernel" -version = "1.2.0-b.3" +version = "1.2.0-beta.3" dependencies = [ "andromeda-std", "cosmwasm-schema", @@ -794,7 +794,7 @@ dependencies = [ [[package]] name = "andromeda-rates" -version = "2.0.4-b.1" +version = "2.0.4-beta.1" dependencies = [ "andromeda-app", "andromeda-modules", @@ -829,7 +829,7 @@ dependencies = [ [[package]] name = "andromeda-set-amount-splitter" -version = "1.2.0-b.1" +version = "1.2.0-beta.1" dependencies = [ "andromeda-app", "andromeda-finance", @@ -866,7 +866,7 @@ dependencies = [ [[package]] name = "andromeda-splitter" -version = "2.3.0-b.1" +version = "2.3.0-beta.1" dependencies = [ "andromeda-app", "andromeda-finance", @@ -883,7 +883,7 @@ dependencies = [ [[package]] name = "andromeda-std" -version = "1.5.0-b.3" +version = "1.5.0-beta.3" dependencies = [ "andromeda-macros", "cosmwasm-schema", @@ -1055,7 +1055,7 @@ dependencies = [ [[package]] name = "andromeda-weighted-distribution-splitter" -version = "2.1.0-b.2" +version = "2.1.0-beta.2" dependencies = [ "andromeda-app", "andromeda-finance", diff --git a/contracts/finance/andromeda-set-amount-splitter/Cargo.toml b/contracts/finance/andromeda-set-amount-splitter/Cargo.toml index 48f2f415f..130852ef0 100644 --- a/contracts/finance/andromeda-set-amount-splitter/Cargo.toml +++ b/contracts/finance/andromeda-set-amount-splitter/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "andromeda-set-amount-splitter" -version = "1.2.0-b.1" +version = "1.2.0-beta.1" edition = "2021" rust-version = "1.75.0" diff --git a/contracts/finance/andromeda-splitter/Cargo.toml b/contracts/finance/andromeda-splitter/Cargo.toml index 3c6d6fad6..8480cea4d 100644 --- a/contracts/finance/andromeda-splitter/Cargo.toml +++ b/contracts/finance/andromeda-splitter/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "andromeda-splitter" -version = "2.3.0-b.1" +version = "2.3.0-beta.1" edition = "2021" rust-version = "1.75.0" diff --git a/contracts/finance/andromeda-weighted-distribution-splitter/Cargo.toml b/contracts/finance/andromeda-weighted-distribution-splitter/Cargo.toml index f7ef07252..d61fcfe7e 100644 --- a/contracts/finance/andromeda-weighted-distribution-splitter/Cargo.toml +++ b/contracts/finance/andromeda-weighted-distribution-splitter/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "andromeda-weighted-distribution-splitter" -version = "2.1.0-b.2" +version = "2.1.0-beta.2" edition = "2021" rust-version = "1.75.0" diff --git a/contracts/math/andromeda-distance/Cargo.toml b/contracts/math/andromeda-distance/Cargo.toml index d0ac3bef4..b11fe7e63 100644 --- a/contracts/math/andromeda-distance/Cargo.toml +++ b/contracts/math/andromeda-distance/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "andromeda-distance" -version = "0.1.0-b.1" +version = "0.1.0-beta.1" edition = "2021" rust-version = "1.75.0" diff --git a/contracts/modules/andromeda-rates/Cargo.toml b/contracts/modules/andromeda-rates/Cargo.toml index b302bda11..9835191ab 100644 --- a/contracts/modules/andromeda-rates/Cargo.toml +++ b/contracts/modules/andromeda-rates/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "andromeda-rates" -version = "2.0.4-b.1" +version = "2.0.4-beta.1" edition = "2021" rust-version = "1.75.0" diff --git a/contracts/non-fungible-tokens/andromeda-auction/Cargo.toml b/contracts/non-fungible-tokens/andromeda-auction/Cargo.toml index 56ec0b0d6..fd5921c1a 100644 --- a/contracts/non-fungible-tokens/andromeda-auction/Cargo.toml +++ b/contracts/non-fungible-tokens/andromeda-auction/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "andromeda-auction" -version = "2.2.5-b.1" +version = "2.2.5-beta.1" edition = "2021" rust-version = "1.75.0" diff --git a/contracts/os/andromeda-adodb/src/tests.rs b/contracts/os/andromeda-adodb/src/tests.rs index 310f14612..4cbd21fde 100644 --- a/contracts/os/andromeda-adodb/src/tests.rs +++ b/contracts/os/andromeda-adodb/src/tests.rs @@ -152,7 +152,7 @@ fn test_publish() { } // Test prelease - let ado_version = ADOVersion::from_type("ado_type_with_beta").with_version("0.1.0-b.1"); + let ado_version = ADOVersion::from_type("ado_type_with_beta").with_version("0.1.0-beta.1"); let code_id = 3; let msg = ExecuteMsg::Publish { ado_type: ado_version.get_type(), diff --git a/contracts/os/andromeda-kernel/Cargo.toml b/contracts/os/andromeda-kernel/Cargo.toml index 485719b04..67e820f67 100644 --- a/contracts/os/andromeda-kernel/Cargo.toml +++ b/contracts/os/andromeda-kernel/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "andromeda-kernel" -version = "1.2.0-b.3" +version = "1.2.0-beta.3" authors = ["Connor Barr "] edition = "2021" rust-version = "1.65.0" diff --git a/packages/andromeda-testing-e2e/Cargo.toml b/packages/andromeda-testing-e2e/Cargo.toml index 33178c2f4..d75e101a2 100644 --- a/packages/andromeda-testing-e2e/Cargo.toml +++ b/packages/andromeda-testing-e2e/Cargo.toml @@ -26,7 +26,7 @@ andromeda-modules = { version = "2.0.0", path = "../andromeda-modules" } andromeda-adodb = { version = "1.0.0", path = "../../contracts/os/andromeda-adodb", features = [ "testing", ] } -andromeda-kernel = { version = "1.2.0-b.1", path = "../../contracts/os/andromeda-kernel", features = [ +andromeda-kernel = { version = "1.2.0-beta.1", path = "../../contracts/os/andromeda-kernel", features = [ "testing", ] } andromeda-vfs = { version = "1.0.0", path = "../../contracts/os/andromeda-vfs", features = [ diff --git a/packages/andromeda-testing/Cargo.toml b/packages/andromeda-testing/Cargo.toml index 2620dba23..d7f6056e1 100644 --- a/packages/andromeda-testing/Cargo.toml +++ b/packages/andromeda-testing/Cargo.toml @@ -26,7 +26,7 @@ andromeda-modules = { version = "2.0.0", path = "../andromeda-modules" } andromeda-adodb = { version = "1.0.0", path = "../../contracts/os/andromeda-adodb", features = [ "testing", ] } -andromeda-kernel = { version = "1.2.0-b.1", path = "../../contracts/os/andromeda-kernel", features = [ +andromeda-kernel = { version = "1.2.0-beta.1", path = "../../contracts/os/andromeda-kernel", features = [ "testing", ] } andromeda-vfs = { version = "1.0.0", path = "../../contracts/os/andromeda-vfs", features = [ diff --git a/packages/deploy/Cargo.toml b/packages/deploy/Cargo.toml index 27704dac7..2eca7e531 100644 --- a/packages/deploy/Cargo.toml +++ b/packages/deploy/Cargo.toml @@ -36,7 +36,7 @@ cw-orch = { workspace = true } cw-orch-daemon = "0.24.2" # OS Contracts -andromeda-kernel = { version = "1.2.0-b.1", path = "../../contracts/os/andromeda-kernel" } +andromeda-kernel = { version = "1.2.0-beta.1", path = "../../contracts/os/andromeda-kernel" } andromeda-adodb = { version = "1.1.1", path = "../../contracts/os/andromeda-adodb" } andromeda-vfs = { version = "1.1.1", path = "../../contracts/os/andromeda-vfs" } andromeda-economics = { version = "1.1.1", path = "../../contracts/os/andromeda-economics" } diff --git a/packages/std/Cargo.toml b/packages/std/Cargo.toml index b95565abb..0dc40d193 100644 --- a/packages/std/Cargo.toml +++ b/packages/std/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "andromeda-std" -version = "1.5.0-b.3" +version = "1.5.0-beta.3" edition = "2021" rust-version = "1.75.0" description = "The standard library for creating an Andromeda Digital Object" diff --git a/scripts/detect_changed_crates.sh b/scripts/detect_changed_crates.sh new file mode 100755 index 000000000..168060eeb --- /dev/null +++ b/scripts/detect_changed_crates.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +# Script to detect crates with changes in dependencies + +# Get the list of changed files +CHANGED_FILES=$(git diff --name-only HEAD^ HEAD) + +# Initialize an array for crates needing a version bump +CRATES_TO_BUMP=() + +# Check each changed file +for file in $CHANGED_FILES; do + if [[ "$file" == */Cargo.toml || "$file" == */Cargo.lock ]]; then + CRATE_DIR=$(dirname "$file") + if [[ ! " ${CRATES_TO_BUMP[@]} " =~ " ${CRATE_DIR} " ]]; then + CRATES_TO_BUMP+=("$CRATE_DIR") + fi + fi +done + +# Output the crates that need a version bump +echo "${CRATES_TO_BUMP[@]}" \ No newline at end of file diff --git a/tests-integration/tests/splitter.rs b/tests-integration/tests/splitter.rs index 9badd969e..78c6113ed 100644 --- a/tests-integration/tests/splitter.rs +++ b/tests-integration/tests/splitter.rs @@ -476,7 +476,7 @@ fn test_splitter_cross_chain_recipient() { code_id: splitter_juno.code_id().unwrap(), ado_type: "splitter".to_string(), action_fees: None, - version: "2.3.0-b.1".to_string(), + version: "2.3.0-beta.1".to_string(), publisher: None, }, None,