diff --git a/substrate/.github/workflows/burnin-label-notification.yml b/substrate/.github/workflows/burnin-label-notification.yml index 22f15c0ec35ee42d0def5b16291b2695ce7696e1..f45455d31db1e2dcd9ed34708630304312a3168a 100644 --- a/substrate/.github/workflows/burnin-label-notification.yml +++ b/substrate/.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/matrix-message-action@v0.0.3 + 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 [${{ github.event.pull_request.title }}](${{ 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 [${{ github.event.pull_request.title }}](${{ github.event.pull_request.html_url }}) diff --git a/substrate/.github/workflows/release-bot.yml b/substrate/.github/workflows/release-bot.yml index ed0a8e5435b9cc5efaf5d247f59290100758aa32..05bea32abc697e4f0aa5ce42f30f7cc475cfa63a 100644 --- a/substrate/.github/workflows/release-bot.yml +++ b/substrate/.github/workflows/release-bot.yml @@ -8,11 +8,24 @@ on: jobs: ping_matrix: runs-on: ubuntu-latest + strategy: + matrix: + channel: + - name: 'General: Rust, Polkadot, Substrate' + room: '!aJymqQYtCjjqImFLSb:parity.io' + pre-release: false + steps: - name: send message - uses: s3krit/matrix-message-action@v0.0.3 + uses: s3krit/matrix-message-action@70ad3fb812ee0e45ff8999d6af11cafad11a6ecf # v0.0.3 with: - room_id: ${{ secrets.MATRIX_ROOM_ID }} - access_token: ${{ secrets.MATRIX_ACCESS_TOKEN }} - message: "**${{github.event.repository.full_name}}:** A release has been ${{github.event.action}}<br/>Release version [${{github.event.release.tag_name}}](${{github.event.release.html_url}})<br/><br/>***Description:***<br/>${{github.event.release.body}}<br/>" - server: "matrix.parity.io" + room_id: ${{ matrix.channel.room }} + access_token: ${{ secrets.RELEASENOTES_MATRIX_V2_ACCESS_TOKEN }} + server: "m.parity.io" + message: | + ***${{github.event.repository.full_name}}:*** A release has been ${{github.event.action}}<br/> + Release version [${{github.event.release.tag_name}}](${{github.event.release.html_url}}) + + ----- + + ${{github.event.release.body}}<br/> diff --git a/substrate/.github/workflows/release-tagging.yml b/substrate/.github/workflows/release-tagging.yml index f7fa913c69709e400c359ab7763778122d47b49b..1862582f40eba2f33a5d94fd356870d4f4c49cce 100644 --- a/substrate/.github/workflows/release-tagging.yml +++ b/substrate/.github/workflows/release-tagging.yml @@ -14,7 +14,7 @@ jobs: - name: Set Git tag uses: s3krit/walking-tag-action@d04f7a53b72ceda4e20283736ce3627011275178 # latest version from master with: - TAG_NAME: release - TAG_MESSAGE: Latest release + tag-name: release + tag-message: Latest release env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/substrate/scripts/ci/common/lib.sh b/substrate/scripts/ci/common/lib.sh index ce6c566d799abf7661cb305d929e21b5405e2273..08c2fe81ada04bb6efcacb67833cfd78cccfe208 100755 --- a/substrate/scripts/ci/common/lib.sh +++ b/substrate/scripts/ci/common/lib.sh @@ -99,7 +99,7 @@ structure_message() { # access_token: see https://matrix.org/docs/guides/client-server-api/ # Usage: send_message $body (json formatted) $room_id $access_token send_message() { -curl -XPOST -d "$1" "https://matrix.parity.io/_matrix/client/r0/rooms/$2/send/m.room.message?access_token=$3" + curl -XPOST -d "$1" "https://m.parity.io/_matrix/client/r0/rooms/$2/send/m.room.message?access_token=$3" } # Check for runtime changes between two commits. This is defined as any changes diff --git a/substrate/scripts/ci/gitlab/publish_draft_release.sh b/substrate/scripts/ci/gitlab/publish_draft_release.sh index 36ee0d63e78f9a204729cbbca56e43bdf7a6249a..88d1de0e04fe3c17245d5e7dd95e5dd632625ad3 100755 --- a/substrate/scripts/ci/gitlab/publish_draft_release.sh +++ b/substrate/scripts/ci/gitlab/publish_draft_release.sh @@ -49,6 +49,6 @@ formatted_msg_body=$(cat <<EOF Draft release created: $html_url EOF ) -send_message "$(structure_message "$msg_body" "$formatted_msg_body")" "$MATRIX_ROOM_ID" "$MATRIX_ACCESS_TOKEN" +send_message "$(structure_message "$msg_body" "$formatted_msg_body")" "!aJymqQYtCjjqImFLSb:parity.io" "$RELEASENOTES_MATRIX_V2_ACCESS_TOKEN" echo "[+] Done! Maybe the release worked..."