Merge branch 'master' into rh-disputes-runtime

.github/dependabot.yml

@@ -2,7 +2,7 @@ version: 2
 updates:
   - package-ecosystem: "cargo"
     directory: "/"
-    labels: ["A2-insubstantial", "B0-silent", "C1-low"]
+    labels: ["A2-insubstantial", "B0-silent", "C1-low 📌"]
     # Handle updates for crates from github.com/paritytech/substrate manually.
     ignore:
       - dependency-name: "substrate-*"
@@ -11,5 +11,7 @@ updates:
       - dependency-name: "frame-*"
       - dependency-name: "fork-tree"
       - dependency-name: "pallet-*"
+      - dependency-name: "beefy-*"
+      - dependency-name: "try-runtime-*"
     schedule:
       interval: "daily"

.github/workflows/check-labels.yml

@@ -19,3 +19,4 @@ jobs:
           GITHUB_PR: ${{ github.event.pull_request.number }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           HEAD_SHA: ${{ github.event.pull_request.head.sha }}
+          BASE_SHA: ${{ github.event.pull_request.base.sha }}

.github/workflows/publish-draft-release.yml

@@ -37,7 +37,7 @@ jobs:
       - name: Cache target dir
         uses: actions/cache@v2
         with:
-          path: '${{ github.workspace }}/target'
+          path: '${{ github.workspace }}/runtime/${{ matrix.runtime }}/target'
           key: srtool-target-${{ matrix.runtime }}-${{ github.sha }}
           restore-keys: |
             srtool-target-${{ matrix.runtime }}-

.gitlab-ci.yml

@@ -263,8 +263,8 @@ publish-polkadot-image:
     DOCKERFILE:                    Dockerfile
     IMAGE_NAME:                    docker.io/paritypr/synth-wave
   rules:
-  # Don't run on releases - this is handled by the Github Action here:
-  # .github/workflows/publish-docker-release.yml
+    # Don't run on releases - this is handled by the Github Action here:
+    # .github/workflows/publish-docker-release.yml
     - if: $CI_COMMIT_REF_NAME =~ /^v[0-9]+\.[0-9]+.*$/              # i.e. v1.0, v2.1rc1
       when: never
     - if: $CI_PIPELINE_SOURCE == "schedule"
@@ -366,6 +366,7 @@ deploy-polkasync-kusama:
 trigger-simnet:
   stage:                           deploy
   image:                           paritytech/tools:latest
+  <<:                              *kubernetes-env
   rules:
     - if: $CI_PIPELINE_SOURCE == "schedule"
     - if: $CI_COMMIT_REF_NAME == "master"
@@ -388,3 +389,4 @@ trigger-simnet:
   script:
     # API trigger for a simnet job
     - ./scripts/gitlab/trigger_pipeline.sh
+  allow_failure:                   true