Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

[CI] Fix release notification message, and add rustc version to release notes #1191

Merged
merged 8 commits into from
Jun 9, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/release-bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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!***<br/>Please update at your earliest convenience.<br/>${{github.event.release.html_url}}<br/><br/>${{github.event.release.body}}<br/>"
message: "***Polkadot ${{github.event.release.tag_name}} has been released!***<br/>Please update at your earliest convenience.<br/>${{github.event.release.html_url}}<br/><br/>${{github.event.release.body}}<br/>"
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!***<br/>Please update at your earliest convenience.<br/>${{github.event.release.html_url}}<br/><br/>${{github.event.release.body}}<br/>"
message: "***Polkadot ${{github.event.release.tag_name}} has been released!***<br/>Please update at your earliest convenience.<br/>${{github.event.release.html_url}}<br/><br/>${{github.event.release.body}}<br/>"
server: "matrix.parity.io"
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

basically i don't mind, but feel like it would be cleaner to add is simply to the ci-linux image.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agree, it's better to have it there than install every time. Or use something that is already installed.

- ./scripts/gitlab/publish_draft_release.sh
interruptible: true
allow_failure: true
Expand Down
3 changes: 3 additions & 0 deletions scripts/gitlab/lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,18 @@ 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)
object_url=$(echo "$tag_out" | jq -r .object.url)
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
Expand Down
10 changes: 9 additions & 1 deletion scripts/gitlab/publish_draft_release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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:'
Expand All @@ -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=""
Expand Down