From acc3522ba8b87abcfa9720f924bd634c4fa629bc Mon Sep 17 00:00:00 2001
From: Chevdor <chevdor@users.noreply.github.com>
Date: Fri, 28 Jul 2023 15:06:05 +0200
Subject: [PATCH] Change Matrix to new secrets and V2 server (#2937)

* Change to new secrets

* Fix rooms

* Fix matrix server

* Notification formatting and matrix server fix
---
 .github/workflows/release-10_rc-automation.yml | 10 +++++-----
 .github/workflows/release-30_create-draft.yml  |  8 ++++----
 .github/workflows/release-99_bot-announce.yml  | 14 ++++++++++----
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/release-10_rc-automation.yml b/.github/workflows/release-10_rc-automation.yml
index 377d3830104..a30d9e6ea7d 100644
--- 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
index 4e4b30c0fc6..2d11dfe18ce 100644
--- a/.github/workflows/release-30_create-draft.yml
+++ b/.github/workflows/release-30_create-draft.yml
@@ -292,15 +292,16 @@ 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/>
 
@@ -308,4 +309,3 @@ jobs:
 
             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
index 155b4500c0e..5c2604924c4 100644
--- 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}})