Merge branch 'master' into slumber-async-backing-feature

paritytech · Jul 28, 2023 · b9c1922 · b9c1922
2 parents 43f1835 + acc3522
commit b9c1922
Show file tree

Hide file tree

Showing 19 changed files with 347 additions and 341 deletions.
diff --git a/.github/workflows/release-10_rc-automation.yml b/.github/workflows/release-10_rc-automation.yml
@@ -12,8 +12,8 @@ jobs:
     strategy:
       matrix:
         channel:
-          - name: 'Cumulus Release Coordination'
-            room: '!ZrLPsivsytpkdJfVaa:matrix.parity.io'
+          - name: 'RelEng: Cumulus Release Coordination'
+            room: '!NAEMyPAHWOiOQHsvus:parity.io'
             pre-releases: true
     steps:
       - name: Checkout sources
@@ -78,10 +78,10 @@ jobs:
         if: steps.create-issue-checklist-client.outputs.url != '' && steps.create-issue-checklist-runtime.outputs.url != ''
         with:
           room_id: ${{ matrix.channel.room }}
-          access_token: ${{ secrets.MATRIX_ACCESS_TOKEN }}
-          server: "matrix.parity.io"
+          access_token: ${{ secrets.RELEASENOTES_MATRIX_V2_ACCESS_TOKEN }}
+          server: "m.parity.io"
           message: |
-            The Release Process for Cumulus ${{ steps.compute_tag.outputs.version }} has been started.
+            The Release Process for Cumulus ${{ steps.compute_tag.outputs.version }} has been started.<br/>
             Tracking issues:
               - client: ${{ steps.create-issue-checklist-client.outputs.url }}"
               - runtime: ${{ steps.create-issue-checklist-runtime.outputs.url }}"
diff --git a/.github/workflows/release-30_create-draft.yml b/.github/workflows/release-30_create-draft.yml
@@ -292,20 +292,20 @@ jobs:
     strategy:
       matrix:
         channel:
-          - name: 'Cumulus Release Coordination'
-            room: '!ZrLPsivsytpkdJfVaa:matrix.parity.io'
+          - name: 'RelEng: Cumulus Release Coordination'
+            room: '!NAEMyPAHWOiOQHsvus:parity.io'
             pre-releases: true
     steps:
       - name: Matrix notification to ${{ matrix.channel.name }}
         uses: s3krit/matrix-message-action@70ad3fb812ee0e45ff8999d6af11cafad11a6ecf # v0.0.3
         with:
           room_id: ${{ matrix.channel.room }}
-          access_token: ${{ secrets.MATRIX_ACCESS_TOKEN }}
+          access_token: ${{ secrets.RELEASENOTES_MATRIX_V2_ACCESS_TOKEN }}
+          server: "m.parity.io"
           message: |
             **New draft for ${{ github.repository }}**: ${{ github.event.inputs.ref2 }}<br/>
 
             Draft release created: [draft](${{ needs.publish-draft-release.outputs.release_url }})
 
             NOTE: The link above will no longer be valid if the draft is edited. You can then use the following link:
             [${{ github.server_url }}/${{ github.repository }}/releases](${{ github.server_url }}/${{ github.repository }}/releases)
-          server: "matrix.parity.io"
diff --git a/.github/workflows/release-99_bot-announce.yml b/.github/workflows/release-99_bot-announce.yml
@@ -10,20 +10,26 @@ jobs:
     strategy:
       matrix:
         channel:
-          - name: 'Cumulus Release Coordination'
-            room: '!ZrLPsivsytpkdJfVaa:matrix.parity.io'
+          - name: 'RelEng: Cumulus Release Coordination'
+            room: '!NAEMyPAHWOiOQHsvus:parity.io'
             pre-releases: 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
 
     steps:
       - name: Matrix notification to ${{ matrix.channel.name }}
         uses: s3krit/matrix-message-action@70ad3fb812ee0e45ff8999d6af11cafad11a6ecf # v0.0.3
         with:
           room_id: ${{ matrix.channel.room }}
-          access_token: ${{ secrets.MATRIX_ACCESS_TOKEN }}
-          server: "matrix.parity.io"
+          access_token: ${{ secrets.RELEASENOTES_MATRIX_V2_ACCESS_TOKEN }}
+          server: "m.parity.io"
           message: |
             A (pre)release has been ${{github.event.action}} in **${{github.event.repository.full_name}}:**<br/>
             Release version: [${{github.event.release.tag_name}}](${{github.event.release.html_url}})