Merge branch 'master' of github.com:paritytech/cumulus into davxy/remove-leaves-portable-with-recovery

Signed-off-by: Andrei Sandu <[email protected]>

Author: sandreim

.github/ISSUE_TEMPLATE/release-runtime.md

@@ -34,6 +34,7 @@ The following checks can be performed after we have forked off to the release-ca
     networks
 - [ ] Run [integration tests](https://github.com/paritytech/cumulus/blob/master/docs/release.md#integration-tests), and make sure they pass.
 - [ ] Push runtime upgrade to Westmint and verify network stability
+- [ ] Push runtime upgrade to Collectives and verify network stability
 
 
 ### Github

.github/dependabot.yml

@@ -10,7 +10,7 @@ updates:
       - dependency-name: "sp-*"
       - dependency-name: "frame-*"
       - dependency-name: "fork-tree"
-      - dependency-name: "remote-externalities"
+      - dependency-name: "frame-remote-externalities"
       - dependency-name: "pallet-*"
       - dependency-name: "beefy-*"
       - dependency-name: "try-runtime-*"
@@ -21,6 +21,7 @@ updates:
       - dependency-name: "xcm*"
       - dependency-name: "kusama-*"
       - dependency-name: "westend-*"
+      - dependency-name: "rococo-*"
     schedule:
       interval: "daily"
   - package-ecosystem: github-actions

.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

.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
@@ -120,7 +124,7 @@ jobs:
           path: cumulus
           ref: ${{ github.event.inputs.ref2 }}
 
-      - uses: ruby/setup-ruby@f2c070bbf74632495b403899c87610cd4cb99dbe # v1.120.1
+      - uses: ruby/setup-ruby@ee2113536afb7f793eed4ce60e8d3b26db912da4 # v1.127.0
         with:
           ruby-version: 3.0.0
 
@@ -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
@@ -235,7 +247,7 @@ jobs:
       - name: Download artifacts
         uses: actions/download-artifact@fb598a63ae348fa914e94cd0ff38f362e927b741 # v3.0.0
 
-      - uses: ruby/setup-ruby@f2c070bbf74632495b403899c87610cd4cb99dbe # v1.120.1
+      - uses: ruby/setup-ruby@ee2113536afb7f793eed4ce60e8d3b26db912da4 # v1.127.0
         with:
           ruby-version: 3.0.0
 
@@ -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

.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

.gitlab-ci.yml

@@ -104,7 +104,7 @@ variables:
     - cargo +nightly --version
     - bash --version
   tags:
-    - linux-docker
+    - linux-docker-vm-c2
 
 .kubernetes-env:
   image:                           "${CI_IMAGE}"
@@ -159,3 +159,19 @@ cancel-pipeline:
     PR_NUM:                        "${PR_NUM}"
   trigger:
     project:                       "parity/infrastructure/ci_cd/pipeline-stopper"
+    branch:                        "as-improve"
+
+remove-cancel-pipeline-message:
+  stage: .post
+  rules:
+    - if: $CI_COMMIT_REF_NAME =~ /^[0-9]+$/                         # PRs
+  variables:
+    PROJECT_ID:                    "${CI_PROJECT_ID}"
+    PROJECT_NAME:                  "${CI_PROJECT_NAME}"
+    PIPELINE_ID:                   "${CI_PIPELINE_ID}"
+    FAILED_JOB_URL:                "https://gitlab.com"
+    FAILED_JOB_NAME:               "nope"
+    PR_NUM:                        "${CI_COMMIT_REF_NAME}"
+  trigger:
+    project:                       "parity/infrastructure/ci_cd/pipeline-stopper"
+    branch:                        "as-improve"