diff --git a/.github/workflows/release-bot.yml b/.github/workflows/release-bot.yml index 8e978932e804..a153cddb056a 100644 --- a/.github/workflows/release-bot.yml +++ b/.github/workflows/release-bot.yml @@ -20,13 +20,13 @@ jobs: with: room_id: ${{ secrets.VALIDATOR_LOUNGE_MATRIX_ROOM_ID }} access_token: ${{ secrets.MATRIX_ACCESS_TOKEN }} - message: "***Kusama ${{github.event.release.tag_name}} has been released!***
Please update at your earliest convenience.
${{github.event.release.html_url}}

${{github.event.release.body}}
" + message: "***Polkadot ${{github.event.release.tag_name}} has been released!***
Please update at your earliest convenience.
${{github.event.release.html_url}}

${{github.event.release.body}}
" server: "matrix.parity.io" - - name: Kusama Announcements + - name: Polkadot Announcements uses: s3krit/matrix-message-action@v0.0.2 with: room_id: ${{ secrets.KUSAMA_ANNOUNCEMENTS_MATRIX_ROOM_ID }} access_token: ${{ secrets.MATRIX_ACCESS_TOKEN }} - message: "***Kusama ${{github.event.release.tag_name}} has been released!***
Please update at your earliest convenience.
${{github.event.release.html_url}}

${{github.event.release.body}}
" + message: "***Polkadot ${{github.event.release.tag_name}} has been released!***
Please update at your earliest convenience.
${{github.event.release.html_url}}

${{github.event.release.body}}
" server: "matrix.parity.io" diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d136d0e87b45..5b9967f3a06a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -98,11 +98,11 @@ check-line-width: publish-draft-release: stage: test - image: parity/tools:latest only: - tags - /^v[0-9]+\.[0-9]+\.[0-9]+.*$/ # i.e. v1.0.1, v2.1.0rc1 script: + - apt-get -y update; apt-get -y install jq - ./scripts/gitlab/publish_draft_release.sh interruptible: true allow_failure: true diff --git a/scripts/gitlab/lib.sh b/scripts/gitlab/lib.sh index 40e25b823bc2..2b3ab805c510 100755 --- a/scripts/gitlab/lib.sh +++ b/scripts/gitlab/lib.sh @@ -22,8 +22,10 @@ check_tag () { repo=$1 tagver=$2 if [ -n "$GITHUB_RELEASE_TOKEN" ]; then + echo '[+] Fetching tag using privileged token' tag_out=$(curl -H "Authorization: token $GITHUB_RELEASE_TOKEN" -s "$api_base/$repo/git/refs/tags/$tagver") else + echo '[+] Fetching tag using unprivileged token' tag_out=$(curl -H "Authorization: token $GITHUB_PR_TOKEN" -s "$api_base/$repo/git/refs/tags/$tagver") fi tag_sha=$(echo "$tag_out" | jq -r .object.sha) @@ -31,6 +33,7 @@ check_tag () { if [ "$tag_sha" = "null" ]; then return 2 fi + echo "[+] Tag object SHA: $tag_sha" verified_str=$(curl -H "Authorization: token $GITHUB_RELEASE_TOKEN" -s "$object_url" | jq -r .verification.verified) if [ "$verified_str" = "true" ]; then # Verified, everything is good diff --git a/scripts/gitlab/publish_draft_release.sh b/scripts/gitlab/publish_draft_release.sh index 146a1c871099..6fd9179cc947 100755 --- a/scripts/gitlab/publish_draft_release.sh +++ b/scripts/gitlab/publish_draft_release.sh @@ -24,9 +24,13 @@ case $? in ;; 1) echo '[!] Tag found but has not been signed. Aborting release.'; exit 1 ;; - 2) echo '[!] Tag not found. Aborting release.'; exit + 2) echo '[!] Tag not found. Aborting release.'; exit 1 esac +# Pull rustc version used by rust-builder for stable and nightly +stable_rustc="$(rustc +stable --version)" +nightly_rustc="$(rustc +nightly --version)" + # Start with referencing current native runtime # and find any referenced PRs since last release # Note: Drop any changes that begin with '[contracts]' or 'contracts:' @@ -41,6 +45,10 @@ release_text="Polkadot native runtime: $polkadot_spec Kusama native runtime: $kusama_spec Westend native runtime: $westend_spec + +This release was built with the following versions of \`rustc\`. Other versions may work. +- $stable_rustc +- $nightly_rustc " runtime_changes=""