Merge branch 'bko-bump-to-1.7' into sv-pk-bridge-snowbridge

# Conflicts: # system-parachains/asset-hubs/asset-hub-kusama/src/lib.rs # system-parachains/asset-hubs/asset-hub-polkadot/src/lib.rs
polkadot-fellows · Feb 20, 2024 · 35c7200 · 35c7200
2 parents 1c8b80f + 2d59678
commit 35c7200
Show file tree

Hide file tree

Showing 13 changed files with 279 additions and 109 deletions.
diff --git a/.github/workflows/integration-tests-matrix.json b/.github/workflows/integration-tests-matrix.json
@@ -0,0 +1,10 @@
+[
+  {
+    "name": "asset-hub-kusama",
+    "package": "asset-hub-kusama-integration-tests"
+  },
+  {
+    "name": "asset-hub-polkadot",
+    "package": "asset-hub-polkadot-integration-tests"
+  }
+]
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -12,9 +12,39 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  test:
-    runs-on: ubuntu-22.04
+  runtime-matrix:
+    runs-on: ubuntu-latest
+    outputs:
+      runtime: ${{ steps.runtime.outputs.runtime }}
+    name: Extract runtimes from matrix
+    steps:
+      - uses: actions/checkout@v2
+      - id: runtime
+        run: |
+          TASKS=$(echo $(cat .github/workflows/runtimes-matrix.json) | sed 's/ //g' )
+          echo $TASKS
+          echo "runtime=$TASKS" >> $GITHUB_OUTPUT
 
+  integration-test-matrix:
+    runs-on: ubuntu-latest
+    outputs:
+      itest: ${{ steps.itest.outputs.itest }}
+    name: Extract integration tests from matrix
+    steps:
+      - uses: actions/checkout@v2
+      - id: itest
+        run: |
+          TASKS=$(echo $(cat .github/workflows/integration-tests-matrix.json) | sed 's/ //g' )
+          echo $TASKS
+          echo "itest=$TASKS" >> $GITHUB_OUTPUT
+
+  runtime-test:
+    needs: [ runtime-matrix ]
+    continue-on-error: true
+    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        runtime: ${{ fromJSON(needs.runtime-matrix.outputs.runtime) }}
     steps:
       - name: Cancel previous runs
         uses: styfle/cancel-workflow-action@b173b6ec0100793626c2d9e6b90435061f4fc3e5 # v0.11.0
@@ -58,13 +88,119 @@ jobs:
         with:
           shared-key: "fellowship-cache-tests"
 
-      - name: Test
-        run: cargo test --workspace --release --locked -q --features=runtime-metrics,try-runtime
+      - name: Test ${{ matrix.runtime.name }}
+        run: cargo test -p ${{ matrix.runtime.package }} --release --locked -q --features=try-runtime
         env:
           RUSTFLAGS: "-C debug-assertions -D warnings"
 
-      - name: Test all features
-        run: cargo test --workspace --release --locked -q --features=runtime-benchmarks,runtime-metrics,try-runtime
+      - name: Test all features ${{ matrix.runtime.name }}
+        run: cargo test -p ${{ matrix.runtime.package }} --release --locked -q --features=runtime-benchmarks,try-runtime
         env:
           RUSTFLAGS: "-C debug-assertions -D warnings"
           SKIP_WASM_BUILD: 1
+
+  integration-test:
+    needs: [ integration-test-matrix ]
+    continue-on-error: true
+    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        itest: ${{ fromJSON(needs.integration-test-matrix.outputs.itest) }}
+    steps:
+      - name: Cancel previous runs
+        uses: styfle/cancel-workflow-action@b173b6ec0100793626c2d9e6b90435061f4fc3e5 # v0.11.0
+        with:
+          access_token: ${{ github.token }}
+
+      - name: Install updates and protobuf-compiler
+        run: sudo apt update && sudo apt install --assume-yes cmake protobuf-compiler
+
+      - name: Free space on the runner
+        run: |
+          df -h
+          sudo apt -y autoremove --purge
+          sudo apt -y autoclean
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf /opt/ghc
+          sudo rm -rf "/usr/local/share/boost"
+          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
+          df -h
+
+      - name: Install stable toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          target: wasm32-unknown-unknown
+          components: rust-src
+
+      - name: Install nightly toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: nightly
+          target: wasm32-unknown-unknown
+
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Fetch cache
+        uses: Swatinem/rust-cache@a95ba195448af2da9b00fb742d14ffaaf3c21f43 # v2.7.0
+        with:
+          shared-key: "fellowship-cache-tests"
+
+      - name: Test ${{ matrix.itest.name }}
+        run: cargo test -p ${{ matrix.itest.package }} --release --locked -q
+        env:
+          RUSTFLAGS: "-C debug-assertions -D warnings"
+
+  build-chain-spec-generator:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cancel previous runs
+        uses: styfle/cancel-workflow-action@b173b6ec0100793626c2d9e6b90435061f4fc3e5 # v0.11.0
+        with:
+          access_token: ${{ github.token }}
+
+      - name: Install updates and protobuf-compiler
+        run: sudo apt update && sudo apt install --assume-yes cmake protobuf-compiler
+
+      - name: Free space on the runner
+        run: |
+          df -h
+          sudo apt -y autoremove --purge
+          sudo apt -y autoclean
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf /opt/ghc
+          sudo rm -rf "/usr/local/share/boost"
+          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
+          df -h
+
+      - name: Install stable toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          target: wasm32-unknown-unknown
+          components: rust-src
+
+      - name: Install nightly toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: nightly
+          target: wasm32-unknown-unknown
+
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Fetch cache
+        uses: Swatinem/rust-cache@a95ba195448af2da9b00fb742d14ffaaf3c21f43 # v2.7.0
+        with:
+          shared-key: "fellowship-cache-tests"
+
+      - name: Build
+        run: cargo test -p chain-spec-generator --release --locked -q --features=runtime-benchmarks
+        env:
+          RUSTFLAGS: "-C debug-assertions -D warnings"
+          SKIP_WASM_BUILD: 1
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/integration-tests/emulated/assets/asset-hub-kusama/Cargo.toml b/integration-tests/emulated/assets/asset-hub-kusama/Cargo.toml
@@ -35,6 +35,3 @@ integration-tests-common = { path = "../../common" }
 asset-hub-kusama-runtime = { path = "../../../../system-parachains/asset-hubs/asset-hub-kusama" }
 kusama-runtime = { package = "staging-kusama-runtime", path = "../../../../relay/kusama" }
 system-parachains-constants = { path = "../../../../system-parachains/constants" }
-
-[features]
-runtime-benchmarks = []
diff --git a/integration-tests/emulated/assets/asset-hub-polkadot/Cargo.toml b/integration-tests/emulated/assets/asset-hub-polkadot/Cargo.toml
@@ -33,6 +33,3 @@ integration-tests-common = { path = "../../common" }
 asset-hub-polkadot-runtime = { path = "../../../../system-parachains/asset-hubs/asset-hub-polkadot" }
 polkadot-runtime = { path = "../../../../relay/polkadot" }
 system-parachains-constants = { path = "../../../../system-parachains/constants" }
-
-[features]
-runtime-benchmarks = []
diff --git a/integration-tests/emulated/chains/Cargo.toml b/integration-tests/emulated/chains/Cargo.toml
@@ -42,8 +42,3 @@ bridge-hub-polkadot-runtime = { path = "../../../system-parachains/bridge-hubs/b
 bridge-hub-kusama-runtime = { path = "../../../system-parachains/bridge-hubs/bridge-hub-kusama" }
 # TODO: replace with `[email protected]` from `polkadot-sdk`
 integration-tests-common = { path = "../common" }
-
-[features]
-runtime-benchmarks = [
-    "penpal-runtime/runtime-benchmarks",
-]
diff --git a/relay/kusama/src/lib.rs b/relay/kusama/src/lib.rs
@@ -2746,7 +2746,7 @@ mod init_state_migration {
 	pub struct InitMigrate;
 	impl OnRuntimeUpgrade for InitMigrate {
 		#[cfg(feature = "try-runtime")]
-		fn pre_upgrade() -> Result<Vec<u8>, sp_runtime::DispatchError> {
+		fn pre_upgrade() -> Result<sp_std::vec::Vec<u8>, sp_runtime::DispatchError> {
 			use parity_scale_codec::Encode;
 			let migration_should_start = AutoLimits::<Runtime>::get().is_none() &&
 				MigrationProcess::<Runtime>::get() == Default::default();
@@ -2778,7 +2778,7 @@ mod init_state_migration {
 
 		#[cfg(feature = "try-runtime")]
 		fn post_upgrade(
-			migration_should_start_bytes: Vec<u8>,
+			migration_should_start_bytes: sp_std::vec::Vec<u8>,
 		) -> Result<(), sp_runtime::DispatchError> {
 			use parity_scale_codec::Decode;
 			let migration_should_start: bool =