Merge remote-tracking branch 'origin/master' into dp-jsonrpsee-integr…

…ation

.github/pr-custom-review.yml

@@ -19,11 +19,20 @@ rules:
     check_type: changed_files
     condition:
       include: .*
-      exclude: ^polkadot-parachains/(statemine|statemint)/src/[^/]+\.rs$
+      # excluding files from 'Runtime files' and 'CI team' rules
+      exclude: ^polkadot-parachains/(statemine|statemint)/src/[^/]+\.rs$|^\.gitlab-ci\.yml|^scripts/ci/.*|^\.github/.*
     min_approvals: 2
     teams:
       - core-devs
 
+  - name: CI team
+    check_type: changed_files
+    condition:
+      include: ^\.gitlab-ci\.yml|^scripts/ci/.*|^\.github/.*
+    min_approvals: 2
+    teams:
+      - ci
+
 prevent-review-request:
   teams:
     - core-devs

.github/workflows/check-labels.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
           ref: ${{ github.event.pull_request.head.ref }}

.github/workflows/docs.yml

@@ -12,7 +12,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v3
 
       - name: Rust versions
         run:  rustup show

.github/workflows/extrinsic-ordering-check-from-bin.yml

@@ -27,7 +27,7 @@ jobs:
       REF_URL: ${{github.event.inputs.reference_url}}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Fetch binary
         run: |

.github/workflows/pr-custom-review.yml

@@ -11,12 +11,31 @@ on:
       - synchronize
       - review_requested
       - review_request_removed
+      - ready_for_review
+      - converted_to_draft
   pull_request_review:
 
 jobs:
   pr-custom-review:
     runs-on: ubuntu-latest
     steps:
+      - name: Skip if pull request is in Draft
+        # `if: github.event.pull_request.draft == true` should be kept here, at
+        # the step level, rather than at the job level. The latter is not
+        # recommended because when the PR is moved from "Draft" to "Ready to
+        # review" the workflow will immediately be passing (since it was skipped),
+        # even though it hasn't actually ran, since it takes a few seconds for
+        # the workflow to start. This is also disclosed in:
+        # https://github.community/t/dont-run-actions-on-draft-pull-requests/16817/17
+        # That scenario would open an opportunity for the check to be bypassed:
+        # 1. Get your PR approved
+        # 2. Move it to Draft
+        # 3. Push whatever commits you want
+        # 4. Move it to "Ready for review"; now the workflow is passing (it was
+        #    skipped) and "Check reviews" is also passing (it won't be updated
+        #    until the workflow is finished)
+        if: github.event.pull_request.draft == true
+        run: exit 1
       - name: pr-custom-review
         uses: paritytech/pr-custom-review@v2
         with:

.github/workflows/quick-check.yml

@@ -31,7 +31,7 @@ jobs:
             target
           key: ${{ runner.os }}-${{ matrix.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Cargo fmt
         uses: actions-rs/cargo@v1

.github/workflows/release-01_rc-automation.yml

@@ -4,13 +4,13 @@ on:
     branches:
       - release-**v[0-9]+.[0-9]+.[0-9]+
   workflow_dispatch:
-  
+
 jobs:
   tag_rc:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - id: compute_tag

.github/workflows/release-02_create-draft.yml

@@ -63,7 +63,7 @@ jobs:
       - name: Build ${{ matrix.runtime }} runtime
         if: ${{ github.event.inputs.release_type != 'client' }}
         id: srtool_build
-        uses: chevdor/srtool-actions@v0.3.0
+        uses: chevdor/srtool-actions@v0.4.0
         with:
           image: paritytech/srtool
           chain: ${{ matrix.runtime }}

.github/workflows/release-10_docker-manual.yml

@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: ${{ github.event.release.tag_name }}
 

.github/workflows/release-10_docker.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: ${{ github.event.release.tag_name }}
 

.github/workflows/srtool.yml

@@ -1,7 +1,7 @@
 name: Srtool build
 
 env:
-  SUBWASM_VERSION: 0.15.0
+  SUBWASM_VERSION: 0.17.0
 
 on:
   push:
@@ -16,7 +16,6 @@ on:
 
     branches:
       - "release*"
-      - "master"
 
   schedule:
     - cron: "00 02 * * 1" # 2AM weekly on monday
@@ -30,13 +29,13 @@ jobs:
       matrix:
         chain: ["statemine", "westmint", "statemint", "rococo-parachain", "shell", "canvas-kusama"]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
       - name: Srtool build
         id: srtool_build
-        uses: chevdor/srtool-actions@v0.3.0
+        uses: chevdor/srtool-actions@v0.4.0
         with:
           chain: ${{ matrix.chain }}
           runtime_dir: polkadot-parachains/${{ matrix.chain }}

.gitlab-ci.yml

@@ -202,7 +202,7 @@ benchmarks-build:
   script:
     - time cargo build --profile production --locked --features runtime-benchmarks
     - mkdir artifacts
-    - cp $CARGO_TARGET_DIR/production/polkadot-collator ./artifacts/
+    - cp target/production/polkadot-collator ./artifacts/
 
 benchmarks:
   stage:                           benchmarks-run
@@ -215,17 +215,17 @@ benchmarks:
     - ./scripts/benchmarks-ci.sh statemint > ./artifacts/bench-statemint.log
     - ./scripts/benchmarks-ci.sh westmint > ./artifacts/bench-westmint.log
     - git status
-    - export BRANCHNAME="${CI_COMMIT_BRANCH}-weights"
+    - export BRANCHNAME="weights-${CI_COMMIT_BRANCH}"
     # Set git config
     - rm -rf .git/config
     - git config --global user.email "${GITHUB_EMAIL}"
     - git config --global user.name "${GITHUB_USER}"
-    - git config remote.origin.url "https://${GITHUB_USER}:${GITHUB_TOKEN}@github.com:/paritytech/${CI_PROJECT_NAME}.git"
+    - git config remote.origin.url "https://${GITHUB_USER}:${GITHUB_TOKEN}@github.com/paritytech/${CI_PROJECT_NAME}.git"
     - git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
     # push results to github
     - git checkout -b $BRANCHNAME
     - git add polkadot-parachains/*
-    - git commit -m "[benchmarks] pr with wieghts"
+    - git commit -m "[benchmarks] pr with weights"
     - git push origin $BRANCHNAME
     # create PR
     - curl -u ${GITHUB_USER}:${GITHUB_TOKEN}