Merge remote-tracking branch 'origin/master' into s0me0ne/wrapper-all…

…ocator
paritytech · Aug 1, 2023 · 66e8a8b · 66e8a8b
2 parents 052b096 + 762f573
commit 66e8a8b
Show file tree

Hide file tree

Showing 524 changed files with 20,266 additions and 15,627 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -29,4 +29,4 @@ rustflags = [
   "-Aclippy::needless_option_as_deref",  # false positives
   "-Aclippy::derivable_impls",           # false positives
   "-Aclippy::stable_sort_primitive",     # prefer stable sort
-]
+]
diff --git a/.github/pr-custom-review.yml b/.github/pr-custom-review.yml
@@ -23,7 +23,7 @@ rules:
       include: .*
       # excluding files from 'Runtime files' and 'CI files' rules
       exclude: ^runtime/(kusama|polkadot)/src/[^/]+\.rs$|^\.gitlab-ci\.yml|^(?!.*\.dic$|.*spellcheck\.toml$)scripts/ci/.*|^\.github/.*
-    min_approvals: 2
+    min_approvals: 3
     teams:
       - core-devs
 

diff --git a/.github/workflows/burnin-label-notification.yml b/.github/workflows/burnin-label-notification.yml
@@ -6,12 +6,19 @@ on:
 jobs:
   notify-devops:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        channel:
+          - name: 'Team: DevOps'
+            room: '!lUslSijLMgNcEKcAiE:parity.io'
+
     steps:
-      - name: Notify devops
-        if: github.event.label.name == 'A1-needsburnin'
-        uses: s3krit/[email protected]
+      - name: Send Matrix message to ${{ matrix.channel.name }}
+        if: startsWith(github.event.label.name, 'A1-')
+        uses: s3krit/matrix-message-action@70ad3fb812ee0e45ff8999d6af11cafad11a6ecf # v0.0.3
         with:
-          room_id: ${{ secrets.POLKADOT_DEVOPS_MATRIX_ROOM_ID }}
-          access_token: ${{ secrets.POLKADOT_DEVOPS_MATRIX_ACCESS_TOKEN }}
-          message: "@room Burn-in request received for the following PR: ${{ github.event.pull_request.html_url }}"
-          server: "matrix.parity.io"
+          room_id: ${{ matrix.channel.room }}
+          access_token: ${{ secrets.RELEASENOTES_MATRIX_V2_ACCESS_TOKEN }}
+          server: m.parity.io
+          message: |
+            @room Burn-in request received for the following PR: ${{ github.event.pull_request.html_url }}
diff --git a/.github/workflows/check-licenses.yml b/.github/workflows/check-licenses.yml
@@ -9,18 +9,18 @@ jobs:
     steps:
       - name: Checkout sources
         uses: actions/[email protected]
-      - uses: actions/setup-node@v3.6.0
+      - uses: actions/setup-node@v3.7.0
         with:
-          node-version: '16.19.0'
+          node-version: '18.x'
           registry-url: 'https://npm.pkg.github.com'
           scope: '@paritytech'
       - name: Check the licenses
         run: |
           shopt -s globstar
 
-          npx @paritytech/[email protected].3 scan \
-            --ensure-licenses Apache-2.0 \
-            --ensure-licenses GPL-3.0-only \
+          npx @paritytech/[email protected].5 scan \
+            --ensure-licenses=Apache-2.0 \
+            --ensure-licenses=GPL-3.0-only \
             ./**/*.rs
         env:
           NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/release-10_candidate.yml b/.github/workflows/release-10_candidate.yml
@@ -7,6 +7,12 @@ on:
 jobs:
   tag_rc:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        channel:
+          - name: "RelEng: Polkadot Release Coordination"
+            room: '!cqAmzdIcbOFwrdrubV:parity.io'
+
     steps:
       - name: Checkout sources
         uses: actions/checkout@v3
@@ -33,6 +39,7 @@ jobs:
             echo "new_tag=$version-rc1" >> $GITHUB_OUTPUT
             echo "first_rc=true" >> $GITHUB_OUTPUT
           fi
+
       - name: Apply new tag
         uses: tvdias/github-tagger@ed7350546e3e503b5e942dffd65bc8751a95e49d # v0.0.2
         with:
@@ -41,6 +48,7 @@ jobs:
           # RELEASE_BRANCH_TOKEN requires public_repo OAuth scope
           repo-token: "${{ secrets.RELEASE_BRANCH_TOKEN }}"
           tag: ${{ steps.compute_tag.outputs.new_tag }}
+
       - id: create-issue
         uses: JasonEtco/create-an-issue@e27dddc79c92bc6e4562f268fffa5ed752639abd # v2.9.1
         # Only create the issue if it's the first release candidate
@@ -50,11 +58,14 @@ jobs:
           VERSION: ${{ steps.compute_tag.outputs.version }}
         with:
           filename: .github/ISSUE_TEMPLATE/release.md
-      - name: Send Matrix message
-        uses: s3krit/[email protected]
+
+      - name: Send Matrix message to ${{ matrix.channel.name }}
+        uses: s3krit/matrix-message-action@70ad3fb812ee0e45ff8999d6af11cafad11a6ecf # v0.0.3
         if: steps.create-issue.outputs.url != ''
         with:
-          room_id: ${{ secrets.INTERNAL_POLKADOT_MATRIX_ROOM_ID }}
-          access_token: ${{ secrets.MATRIX_ACCESS_TOKEN }}
-          server: "matrix.parity.io"
-          message: "Release process for polkadot ${{ steps.compute_tag.outputs.version }} has been started. Tracking issue: ${{ steps.create-issue.outputs.url }}"
+          room_id: ${{ matrix.channel.room }}
+          access_token: ${{ secrets.RELEASENOTES_MATRIX_V2_ACCESS_TOKEN }}
+          server: m.parity.io
+          message: |
+            Release process for polkadot ${{ steps.compute_tag.outputs.version }} has been started.<br/>
+            Tracking issue: ${{ steps.create-issue.outputs.url }}
diff --git a/.github/workflows/release-30_publish-draft-release.yml b/.github/workflows/release-30_publish-draft-release.yml
@@ -181,11 +181,19 @@ jobs:
   post_to_matrix:
     runs-on: ubuntu-latest
     needs: publish-draft-release
+    strategy:
+      matrix:
+        channel:
+          - name: "RelEng: Polkadot Release Coordination"
+            room: '!cqAmzdIcbOFwrdrubV:parity.io'
+
     steps:
-      - name: Internal polkadot channel
-        uses: s3krit/[email protected]
+      - name: Send Matrix message to ${{ matrix.channel.name }}
+        uses: s3krit/matrix-message-action@70ad3fb812ee0e45ff8999d6af11cafad11a6ecf # v0.0.3
         with:
-          room_id: ${{ secrets.INTERNAL_POLKADOT_MATRIX_ROOM_ID }}
-          access_token: ${{ secrets.MATRIX_ACCESS_TOKEN }}
-          message: "**New version of polkadot tagged**: ${{ github.ref }}<br/>Draft release created: ${{ needs.publish-draft-release.outputs.release_url }}"
-          server: "matrix.parity.io"
+          room_id: ${{ matrix.channel.room }}
+          access_token: ${{ secrets.RELEASENOTES_MATRIX_V2_ACCESS_TOKEN }}
+          server: m.parity.io
+          message: |
+            **New version of polkadot tagged**: ${{ github.ref }}<br/>
+            Draft release created: ${{ needs.publish-draft-release.outputs.release_url }}
diff --git a/.github/workflows/release-99_bot.yml b/.github/workflows/release-99_bot.yml
@@ -21,17 +21,29 @@ jobs:
           - name: '#polkadot-announcements:matrix.parity.io'
             room: '!UqHPWiCBGZWxrmYBkF:matrix.parity.io'
             pre-release: false
+          - name: "RelEng: Polkadot Release Coordination"
+            room: '!cqAmzdIcbOFwrdrubV:parity.io'
+            pre-release: true
           - name: 'Ledger <> Polkadot Coordination'
             room: '!EoIhaKfGPmFOBrNSHT:web3.foundation'
             pre-release: true
+          - name: 'General: Rust, Polkadot, Substrate'
+            room: '!aJymqQYtCjjqImFLSb:parity.io'
+            pre-release: false
+          - name: 'Team: DevOps'
+            room: '!lUslSijLMgNcEKcAiE:parity.io'
+            pre-release: true
 
     runs-on: ubuntu-latest
     steps:
       - name: Send Matrix message to ${{ matrix.channel.name }}
         if: github.event.release.prerelease == false || matrix.channel.pre-release
-        uses: s3krit/[email protected]
+        uses: s3krit/matrix-message-action@70ad3fb812ee0e45ff8999d6af11cafad11a6ecf # v0.0.3
         with:
           room_id: ${{ matrix.channel.room }}
-          access_token: ${{ secrets.MATRIX_ACCESS_TOKEN }}
-          server: "m.parity.io"
-          message: "***Polkadot ${{github.event.release.tag_name}} has been released!***<br/>${{github.event.release.html_url}}<br/><br/>${{github.event.release.body}}<br/>"
+          access_token: ${{ secrets.RELEASENOTES_MATRIX_V2_ACCESS_TOKEN }}
+          server: m.parity.io
+          message: |
+            ***Polkadot ${{github.event.release.tag_name}} has been released!***<br/>
+            ${{github.event.release.html_url}}<br/><br/>
+            ${{github.event.release.body}}<br/>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -33,7 +33,7 @@ variables:
   GIT_STRATEGY: fetch
   GIT_DEPTH: 100
   CI_SERVER_NAME: "GitLab CI"
-  CI_IMAGE: "paritytech/ci-linux:production"
+  CI_IMAGE: !reference [.ci-unified, variables, CI_IMAGE] 
   BUILDAH_IMAGE: "quay.io/buildah/stable:v1.29"
   BUILDAH_COMMAND: "buildah --storage-driver overlay2"
   DOCKER_OS: "debian:stretch"
@@ -221,8 +221,12 @@ include:
   - scripts/ci/gitlab/pipeline/zombienet.yml
   # timestamp handler
   - project: parity/infrastructure/ci_cd/shared
-    ref: v0.2
+    ref: main
     file: /common/timestamp.yml
+  - project: parity/infrastructure/ci_cd/shared
+    ref: main
+    file: /common/ci-unified.yml   
+
 
 #### stage:                        .post