From 19bcbed21e688659a49ab3cebbc1dc7c08cb8d9d Mon Sep 17 00:00:00 2001 From: Liam Aharon Date: Thu, 22 Jun 2023 18:28:53 +0200 Subject: [PATCH 01/10] add rococo test and run ci every pr --- scripts/ci/gitlab/pipeline/check.yml | 38 +++++++++++++++------------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/scripts/ci/gitlab/pipeline/check.yml b/scripts/ci/gitlab/pipeline/check.yml index 15dc9bae892a..7a50bf0207ed 100644 --- a/scripts/ci/gitlab/pipeline/check.yml +++ b/scripts/ci/gitlab/pipeline/check.yml @@ -51,7 +51,6 @@ check-try-runtime: - cargo check --locked --features try-runtime --all # More info can be found here: https://github.com/paritytech/polkadot/pull/5865 -# Works only in PRs with E1 label .check-runtime-migration: stage: check extends: @@ -60,23 +59,15 @@ check-try-runtime: - .compiler-info script: - | - export has_runtimemigration_label=$(curl -sS -H "Accept: application/vnd.github+json" \ - -H "Authorization: token $GITHUB_PR_TOKEN" \ - https://api.github.com/repos/paritytech/polkadot/issues/$CI_COMMIT_REF_NAME/labels | grep "E0-runtime_migration" | wc -l) - - | - if [[ $has_runtimemigration_label != 0 ]]; then - echo "Found label runtime_migration. Running tests" - export RUST_LOG=remote-ext=debug,runtime=debug - echo "---------- Running try-runtime for ${NETWORK} ----------" - time cargo build --locked --release -p "$NETWORK"-runtime - time cargo run --locked --release --features try-runtime try-runtime \ - --runtime ./target/release/wbuild/"$NETWORK"-runtime/target/wasm32-unknown-unknown/release/"$NETWORK"_runtime.wasm \ - -lruntime=debug \ - --chain=${NETWORK}-dev \ - on-runtime-upgrade live --uri wss://${NETWORK}-try-runtime-node.parity-chains.parity.io:443 - else - echo "runtime_migration label not found. Skipping" - fi + echo "Found label runtime_migration. Running tests" + export RUST_LOG=remote-ext=debug,runtime=debug + echo "---------- Running try-runtime for ${NETWORK} ----------" + time cargo build --locked -p "$NETWORK"-runtime + time cargo run --locked -r -p node-template --bin node-template --features try-runtime try-runtime \ + --runtime ./target/release/wbuild/"$NETWORK"-runtime/target/wasm32-unknown-unknown/release/"$NETWORK"_runtime.wasm \ + -lruntime=debug \ + --chain=${NETWORK}-dev \ + on-runtime-upgrade live --uri wss://${NETWORK}-try-runtime-node.parity-chains.parity.io:443 check-runtime-migration-polkadot: stage: check @@ -111,6 +102,17 @@ check-runtime-migration-westend: NETWORK: "westend" allow_failure: true # FIXME https://github.com/paritytech/substrate/issues/13107 +check-runtime-migration-rococo: + stage: check + extends: + - .docker-env + - .test-pr-refs + - .compiler-info + - .check-runtime-migration + variables: + NETWORK: "rococo" + allow_failure: true # FIXME https://github.com/paritytech/substrate/issues/13107 + # is broken, need to fix check-no-default-features: stage: check From 5985842457a367c52f9db5d097906a641e413155 Mon Sep 17 00:00:00 2001 From: Liam Aharon Date: Thu, 22 Jun 2023 18:40:22 +0200 Subject: [PATCH 02/10] remove debug logging from ci output --- scripts/ci/gitlab/pipeline/check.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/ci/gitlab/pipeline/check.yml b/scripts/ci/gitlab/pipeline/check.yml index 7a50bf0207ed..48a0db2d52ed 100644 --- a/scripts/ci/gitlab/pipeline/check.yml +++ b/scripts/ci/gitlab/pipeline/check.yml @@ -65,7 +65,6 @@ check-try-runtime: time cargo build --locked -p "$NETWORK"-runtime time cargo run --locked -r -p node-template --bin node-template --features try-runtime try-runtime \ --runtime ./target/release/wbuild/"$NETWORK"-runtime/target/wasm32-unknown-unknown/release/"$NETWORK"_runtime.wasm \ - -lruntime=debug \ --chain=${NETWORK}-dev \ on-runtime-upgrade live --uri wss://${NETWORK}-try-runtime-node.parity-chains.parity.io:443 From a045a4bd05cff21513d1b67a794670c113b14800 Mon Sep 17 00:00:00 2001 From: Liam Aharon Date: Thu, 22 Jun 2023 19:08:02 +0200 Subject: [PATCH 03/10] fix run command --- scripts/ci/gitlab/pipeline/check.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ci/gitlab/pipeline/check.yml b/scripts/ci/gitlab/pipeline/check.yml index 48a0db2d52ed..37d3ad321639 100644 --- a/scripts/ci/gitlab/pipeline/check.yml +++ b/scripts/ci/gitlab/pipeline/check.yml @@ -62,8 +62,8 @@ check-try-runtime: echo "Found label runtime_migration. Running tests" export RUST_LOG=remote-ext=debug,runtime=debug echo "---------- Running try-runtime for ${NETWORK} ----------" - time cargo build --locked -p "$NETWORK"-runtime - time cargo run --locked -r -p node-template --bin node-template --features try-runtime try-runtime \ + time cargo build --release --locked -p "$NETWORK"-runtime + time cargo run --locked --release --features try-runtime try-runtime \ --runtime ./target/release/wbuild/"$NETWORK"-runtime/target/wasm32-unknown-unknown/release/"$NETWORK"_runtime.wasm \ --chain=${NETWORK}-dev \ on-runtime-upgrade live --uri wss://${NETWORK}-try-runtime-node.parity-chains.parity.io:443 From 7285355092c720c4e53f4475dd3f44a80e3458eb Mon Sep 17 00:00:00 2001 From: Liam Aharon Date: Tue, 27 Jun 2023 07:32:41 +1000 Subject: [PATCH 04/10] Update scripts/ci/gitlab/pipeline/check.yml Co-authored-by: Alexander Samusev <41779041+alvicsam@users.noreply.github.com> --- scripts/ci/gitlab/pipeline/check.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/ci/gitlab/pipeline/check.yml b/scripts/ci/gitlab/pipeline/check.yml index 37d3ad321639..5a85506572aa 100644 --- a/scripts/ci/gitlab/pipeline/check.yml +++ b/scripts/ci/gitlab/pipeline/check.yml @@ -59,7 +59,6 @@ check-try-runtime: - .compiler-info script: - | - echo "Found label runtime_migration. Running tests" export RUST_LOG=remote-ext=debug,runtime=debug echo "---------- Running try-runtime for ${NETWORK} ----------" time cargo build --release --locked -p "$NETWORK"-runtime From 2bd86ea7d78f17416893707411f6668773892669 Mon Sep 17 00:00:00 2001 From: Liam Aharon Date: Tue, 27 Jun 2023 12:52:41 +0200 Subject: [PATCH 05/10] make --checks explicit --- scripts/ci/gitlab/pipeline/check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/gitlab/pipeline/check.yml b/scripts/ci/gitlab/pipeline/check.yml index 37d3ad321639..0321af008a27 100644 --- a/scripts/ci/gitlab/pipeline/check.yml +++ b/scripts/ci/gitlab/pipeline/check.yml @@ -66,7 +66,7 @@ check-try-runtime: time cargo run --locked --release --features try-runtime try-runtime \ --runtime ./target/release/wbuild/"$NETWORK"-runtime/target/wasm32-unknown-unknown/release/"$NETWORK"_runtime.wasm \ --chain=${NETWORK}-dev \ - on-runtime-upgrade live --uri wss://${NETWORK}-try-runtime-node.parity-chains.parity.io:443 + on-runtime-upgrade --checks pre-and-post live --uri wss://${NETWORK}-try-runtime-node.parity-chains.parity.io:443 check-runtime-migration-polkadot: stage: check From 3ef4819e0250c736613fb94265bb176625160522 Mon Sep 17 00:00:00 2001 From: Liam Aharon Date: Tue, 27 Jun 2023 14:14:42 +0200 Subject: [PATCH 06/10] fix checks --- scripts/ci/gitlab/pipeline/check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/gitlab/pipeline/check.yml b/scripts/ci/gitlab/pipeline/check.yml index 918abd17e8cf..52f09889a325 100644 --- a/scripts/ci/gitlab/pipeline/check.yml +++ b/scripts/ci/gitlab/pipeline/check.yml @@ -65,7 +65,7 @@ check-try-runtime: time cargo run --locked --release --features try-runtime try-runtime \ --runtime ./target/release/wbuild/"$NETWORK"-runtime/target/wasm32-unknown-unknown/release/"$NETWORK"_runtime.wasm \ --chain=${NETWORK}-dev \ - on-runtime-upgrade --checks pre-and-post live --uri wss://${NETWORK}-try-runtime-node.parity-chains.parity.io:443 + on-runtime-upgrade --checks=pre-and-post live --uri wss://${NETWORK}-try-runtime-node.parity-chains.parity.io:443 check-runtime-migration-polkadot: stage: check From 8dda471704fc1461f517de118de4bf1ee1c27d51 Mon Sep 17 00:00:00 2001 From: Liam Aharon Date: Mon, 24 Jul 2023 13:43:08 +0700 Subject: [PATCH 07/10] kick ci --- runtime/kusama/src/governance/mod.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/runtime/kusama/src/governance/mod.rs b/runtime/kusama/src/governance/mod.rs index c8a7b360ed4e..971ef93162b3 100644 --- a/runtime/kusama/src/governance/mod.rs +++ b/runtime/kusama/src/governance/mod.rs @@ -16,6 +16,7 @@ //! New governance configurations for the Kusama runtime. + use super::*; use frame_support::{ parameter_types, From ffa598a869e8733b111089917b07f56578803226 Mon Sep 17 00:00:00 2001 From: Liam Aharon Date: Mon, 24 Jul 2023 13:43:18 +0700 Subject: [PATCH 08/10] kick ci --- runtime/kusama/src/governance/mod.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/runtime/kusama/src/governance/mod.rs b/runtime/kusama/src/governance/mod.rs index 971ef93162b3..c8a7b360ed4e 100644 --- a/runtime/kusama/src/governance/mod.rs +++ b/runtime/kusama/src/governance/mod.rs @@ -16,7 +16,6 @@ //! New governance configurations for the Kusama runtime. - use super::*; use frame_support::{ parameter_types, From 29f500a584180f5a02b6de5386b88ab7b5d578e2 Mon Sep 17 00:00:00 2001 From: Liam Aharon Date: Mon, 24 Jul 2023 15:15:29 +0700 Subject: [PATCH 09/10] kick ci --- runtime/polkadot/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index 55ddb4707791..d9c66674dd1c 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -1478,7 +1478,7 @@ impl Get for NominationPoolsMigrationV4OldPallet { } } -/// All migrations that will run on the next runtime upgrade. +/// All migrations that will run on the next runtime upgrade . /// /// This contains the combined migrations of the last 10 releases. It allows to skip runtime /// upgrades in case governance decides to do so. THE ORDER IS IMPORTANT. From 595d36c1972e3b801535e6c9598392f7e0ed51e0 Mon Sep 17 00:00:00 2001 From: Liam Aharon Date: Mon, 24 Jul 2023 15:15:43 +0700 Subject: [PATCH 10/10] kick ci --- runtime/polkadot/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index d9c66674dd1c..55ddb4707791 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -1478,7 +1478,7 @@ impl Get for NominationPoolsMigrationV4OldPallet { } } -/// All migrations that will run on the next runtime upgrade . +/// All migrations that will run on the next runtime upgrade. /// /// This contains the combined migrations of the last 10 releases. It allows to skip runtime /// upgrades in case governance decides to do so. THE ORDER IS IMPORTANT.