Merge remote-tracking branch 'origin/master' into na-companion-12663

paritytech · Dec 2, 2022 · 0e63d99 · 0e63d99
2 parents f9bf3ba + 8b6984c
commit 0e63d99
Show file tree

Hide file tree

Showing 84 changed files with 5,784 additions and 668 deletions.
diff --git a/.github/pr-custom-review.yml b/.github/pr-custom-review.yml
@@ -6,7 +6,7 @@ action-review-team: ci
 rules:
   - name: Runtime files
     check_type: changed_files
-    condition: ^parachains/runtimes/assets/(statemine|statemint)/src/[^/]+\.rs$
+    condition: ^parachains/runtimes/assets/(statemine|statemint)/src/[^/]+\.rs$|^parachains/runtimes/bridge-hubs/(bridge-hub-kusama|bridge-hub-polkadot)/src/[^/]+\.rs$|^parachains/runtimes/collectives/collectives-polkadot/src/[^/]+\.rs$|^parachains/common/src/[^/]+\.rs$
     all_distinct:
       - min_approvals: 1
         teams:
@@ -20,7 +20,7 @@ rules:
     condition:
       include: .*
       # excluding files from 'Runtime files' and 'CI files' rules
-      exclude: ^parachains/runtimes/assets/(statemine|statemint)/src/[^/]+\.rs$|^\.gitlab-ci\.yml|^scripts/ci/.*|^\.github/.*
+      exclude: ^parachains/runtimes/assets/(statemine|statemint)/src/[^/]+\.rs$|^parachains/runtimes/bridge-hubs/(bridge-hub-kusama|bridge-hub-polkadot)/src/[^/]+\.rs$|^parachains/runtimes/collectives/collectives-polkadot/src/[^/]+\.rs$|^parachains/common/src/[^/]+\.rs$|^\.gitlab-ci\.yml|^scripts/ci/.*|^\.github/.*
     min_approvals: 2
     teams:
       - core-devs

diff --git a/.github/workflows/release-30_create-draft.yml b/.github/workflows/release-30_create-draft.yml
@@ -50,6 +50,10 @@ jobs:
             runtime: statemint
           - category: assets
             runtime: westmint
+          - category: bridge-hubs
+            runtime: bridge-hub-kusama
+          - category: bridge-hubs
+            runtime: bridge-hub-rococo
           - category: collectives
             runtime: collectives-polkadot
           - category: contracts
@@ -150,6 +154,8 @@ jobs:
           WESTMINT_DIGEST: ${{ github.workspace}}/westmint-srtool-json/westmint-srtool-digest.json
           STATEMINE_DIGEST: ${{ github.workspace}}/statemine-srtool-json/statemine-srtool-digest.json
           STATEMINT_DIGEST: ${{ github.workspace}}/statemint-srtool-json/statemint-srtool-digest.json
+          BRIDGE_HUB_ROCOCO_DIGEST: ${{ github.workspace}}/bridge-hub-rococo-srtool-json/bridge-hub-rococo-srtool-digest.json
+          BRIDGE_HUB_KUSAMA_DIGEST: ${{ github.workspace}}/bridge-hub-kusama-srtool-json/bridge-hub-kusama-srtool-digest.json
           COLLECTIVES_POLKADOT_DIGEST: ${{ github.workspace}}/collectives-polkadot-srtool-json/collectives-polkadot-srtool-digest.json
           ROCOCO_PARA_DIGEST: ${{ github.workspace}}/rococo-parachain-srtool-json/rococo-parachain-srtool-digest.json
           CANVAS_KUSAMA_DIGEST: ${{ github.workspace}}/contracts-rococo-srtool-json/contracts-rococo-srtool-digest.json
@@ -165,6 +171,8 @@ jobs:
             ls -al $WESTMINT_DIGEST || true
             ls -al $STATEMINE_DIGEST || true
             ls -al $STATEMINT_DIGEST || true
+            ls -al $BRIDGE_HUB_ROCOCO_DIGEST || true
+            ls -al $BRIDGE_HUB_KUSAMA_DIGEST || true
             ls -al $COLLECTIVES_POLKADOT_DIGEST || true
             ls -al $ROCOCO_PARA_DIGEST || true
             ls -al $CANVAS_KUSAMA_DIGEST || true
@@ -216,6 +224,10 @@ jobs:
             runtime: statemint
           - category: assets
             runtime: westmint
+          - category: bridge-hubs
+            runtime: bridge-hub-kusama
+          - category: bridge-hubs
+            runtime: bridge-hub-rococo
           - category: collectives
             runtime: collectives-polkadot
           - category: contracts
@@ -255,7 +267,7 @@ jobs:
         id: fix-runtime-path
         run: |
           cd "${{ matrix.runtime }}-runtime/"
-          mv "$(sed -E 's/-(.*)/_\1/' <<< ${{ matrix.runtime }})_runtime.compact.compressed.wasm" "${{ matrix.runtime }}_runtime.compact.compressed.wasm" || true
+          mv "$(sed -E 's/- */_/g' <<< ${{ matrix.runtime }})_runtime.compact.compressed.wasm" "${{ matrix.runtime }}_runtime.compact.compressed.wasm" || true
 
       - name: Upload compressed ${{ matrix.runtime }} wasm
         uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5 # v1.0.2

diff --git a/.github/workflows/srtool.yml b/.github/workflows/srtool.yml
@@ -37,6 +37,10 @@ jobs:
             runtime: statemint
           - category: assets
             runtime: westmint
+          - category: bridge-hubs
+            runtime: bridge-hub-kusama
+          - category: bridge-hubs
+            runtime: bridge-hub-rococo
           - category: collectives
             runtime: collectives-polkadot
           - category: contracts