From 14f7591fc04fa93585b6c60ae309c4b396046071 Mon Sep 17 00:00:00 2001 From: Misha Kolesnik Date: Tue, 17 Oct 2023 17:18:51 +0300 Subject: [PATCH 1/6] CI: Fix production release workflow (#622) --- .github/workflows/branch-main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/branch-main.yml b/.github/workflows/branch-main.yml index e1565b1768..a70e100993 100644 --- a/.github/workflows/branch-main.yml +++ b/.github/workflows/branch-main.yml @@ -20,8 +20,8 @@ jobs: if: ( github.event.pull_request.merged == true && startsWith(github.head_ref, 'rc/') || github.event_name == 'workflow_dispatch' ) runs-on: ubuntu-latest outputs: - RELEASE_VERSION: ${{ steps.set_vars.outputs.RELEASE_VERSION }} - RELEASE_CANDIDATE_VERSION: ${{ steps.set_vars.outputs.RELEASE_CANDIDATE_VERSION }} + RELEASE_VERSION: ${{ github.event_name == 'workflow_dispatch' && inputs.release_version || steps.set_vars.outputs.RELEASE_VERSION }} + RELEASE_CANDIDATE_VERSION: ${{ github.event_name == 'workflow_dispatch' && format('{0}-rc', inputs.release_version) || steps.set_vars.outputs.RELEASE_CANDIDATE_VERSION }} steps: - name: Set release version id: set_vars From bd7c23da30684469aa15d77ae7c1e368810d9a6d Mon Sep 17 00:00:00 2001 From: Mateusz Nowakowski Date: Mon, 23 Oct 2023 13:06:10 +0200 Subject: [PATCH 2/6] disable crowdloan migration --- Cargo.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 13f334f04a..8895063b1b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6287,7 +6287,7 @@ dependencies = [ [[package]] name = "pallet-crowdloan-rewards" version = "0.6.0" -source = "git+https://github.com/mangata-finance//crowdloan-rewards?branch=mangata-dev#93f22908087bf475bf1021bc9c3337fefd00fb39" +source = "git+https://github.com/mangata-finance//crowdloan-rewards?branch=mangata-dev#ee55b9650c36f63063357a83e54d0f8b881b4c93" dependencies = [ "ed25519-dalek", "frame-benchmarking", From 68da5dcd15acd36d14802a6c6329d3f496efe920 Mon Sep 17 00:00:00 2001 From: Mateusz Nowakowski Date: Mon, 23 Oct 2023 13:07:26 +0200 Subject: [PATCH 3/6] Revert "temporary disable try-runtime for rococo" This reverts commit 4f493fe84c4a9cdbf8bd7e70e6a73ea697ef7001. --- .github/workflows/reusable-build-and-test.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/reusable-build-and-test.yml b/.github/workflows/reusable-build-and-test.yml index feb94e9266..37c552f73f 100644 --- a/.github/workflows/reusable-build-and-test.yml +++ b/.github/workflows/reusable-build-and-test.yml @@ -249,9 +249,8 @@ jobs: ~/.cache/sccache key: cargo-try-runtime-${{ inputs.cache_version }}-${{ hashFiles('Cargo.lock') }} - # NOTE: Rococo has been already upgraded so lets disable rococo try-runtime - # - name: Run try-runtime Rococo testnet - # run: cargo run --release --features=try-runtime,mangata-rococo try-runtime --chain=rococo --runtime=target/release/wbuild/mangata-rococo-runtime/mangata_rococo_runtime.wasm on-runtime-upgrade live --uri wss://collator-01-ws-rococo.mangata.online:443 + - name: Run try-runtime Rococo testnet + run: cargo run --release --features=try-runtime,mangata-rococo try-runtime --chain=rococo --runtime=target/release/wbuild/mangata-rococo-runtime/mangata_rococo_runtime.wasm on-runtime-upgrade live --uri wss://collator-01-ws-rococo.mangata.online:443 - name: Run try-runtime Kusama Mainnet run: cargo run --release --features=try-runtime try-runtime --chain=kusama --runtime=target/release/wbuild/mangata-kusama-runtime/mangata_kusama_runtime.wasm on-runtime-upgrade live --uri wss://kusama-rpc.mangata.online:443 From 8e3a23f31be637096524cb2ec7e7a7362b0de88f Mon Sep 17 00:00:00 2001 From: Mateusz Nowakowski Date: Mon, 23 Oct 2023 14:09:28 +0200 Subject: [PATCH 4/6] bump runtime versions --- runtime/mangata-kusama/src/lib.rs | 4 ++-- runtime/mangata-rococo/src/lib.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/runtime/mangata-kusama/src/lib.rs b/runtime/mangata-kusama/src/lib.rs index 33aa0ac711..ac4dc22e4e 100644 --- a/runtime/mangata-kusama/src/lib.rs +++ b/runtime/mangata-kusama/src/lib.rs @@ -117,10 +117,10 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("mangata-parachain"), impl_name: create_runtime_str!("mangata-parachain"), authoring_version: 15, - spec_version: 003100, + spec_version: 003200, impl_version: 0, apis: RUNTIME_API_VERSIONS, - transaction_version: 003100, + transaction_version: 003200, state_version: 0, }; diff --git a/runtime/mangata-rococo/src/lib.rs b/runtime/mangata-rococo/src/lib.rs index dd84e1a708..4544151282 100644 --- a/runtime/mangata-rococo/src/lib.rs +++ b/runtime/mangata-rococo/src/lib.rs @@ -117,10 +117,10 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { impl_name: create_runtime_str!("mangata-parachain"), authoring_version: 14, - spec_version: 003100, + spec_version: 003200, impl_version: 0, apis: RUNTIME_API_VERSIONS, - transaction_version: 003100, + transaction_version: 003200, state_version: 0, }; From 20753aa47e9962e218aeff1322515d56a663969a Mon Sep 17 00:00:00 2001 From: Mateusz Nowakowski Date: Mon, 23 Oct 2023 15:29:23 +0200 Subject: [PATCH 5/6] disable crowdloan migration --- Cargo.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 8895063b1b..0ef6077441 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6287,7 +6287,7 @@ dependencies = [ [[package]] name = "pallet-crowdloan-rewards" version = "0.6.0" -source = "git+https://github.com/mangata-finance//crowdloan-rewards?branch=mangata-dev#ee55b9650c36f63063357a83e54d0f8b881b4c93" +source = "git+https://github.com/mangata-finance//crowdloan-rewards?branch=mangata-dev#8a59680579ca8377e79523a2008244881dca5569" dependencies = [ "ed25519-dalek", "frame-benchmarking", From 97498feccb300a53ea93981a02a6d3f4d230a4f7 Mon Sep 17 00:00:00 2001 From: Mateusz Nowakowski Date: Tue, 24 Oct 2023 12:09:46 +0200 Subject: [PATCH 6/6] bump crowdloan-rewards --- Cargo.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 0ef6077441..85ccdcabe6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6287,7 +6287,7 @@ dependencies = [ [[package]] name = "pallet-crowdloan-rewards" version = "0.6.0" -source = "git+https://github.com/mangata-finance//crowdloan-rewards?branch=mangata-dev#8a59680579ca8377e79523a2008244881dca5569" +source = "git+https://github.com/mangata-finance//crowdloan-rewards?branch=mangata-dev#6d7f6cc5c8c5122e031e88062ffc48d7c6bc8f3e" dependencies = [ "ed25519-dalek", "frame-benchmarking",