diff --git a/.maintain/gitlab/lib.sh b/.maintain/gitlab/lib.sh index bc0e06a6d46c4..c8b2d73e6097f 100755 --- a/.maintain/gitlab/lib.sh +++ b/.maintain/gitlab/lib.sh @@ -14,6 +14,14 @@ sanitised_git_logs(){ sed 's/^/* /g' } +# Returns the last published release on github +# repo: 'organization/repo' +# Usage: last_github_release "$repo" +last_github_release(){ + curl -H "Authorization: token $GITHUB_RELEASE_TOKEN" \ + -s "$api_base/$1/releases/latest" | jq '.tag_name' +} + # Checks whether a tag on github has been verified # repo: 'organization/repo' # tagver: 'v1.2.3' diff --git a/.maintain/gitlab/publish_draft_release.sh b/.maintain/gitlab/publish_draft_release.sh index 8566827a09920..4f73575f5bbaf 100755 --- a/.maintain/gitlab/publish_draft_release.sh +++ b/.maintain/gitlab/publish_draft_release.sh @@ -11,7 +11,9 @@ labels=( ) version="$CI_COMMIT_TAG" -last_version=$(git tag -l | sort -V | grep -B 1 -x "$version" | head -n 1) + +# Note that this is not the last *tagged* version, but the last *published* version +last_version=$(last_github_release 'paritytech/substrate') echo "[+] Version: $version; Previous version: $last_version" all_changes="$(sanitised_git_logs "$last_version" "$version")" @@ -39,7 +41,7 @@ $labelled_changes" echo "[+] Release text generated: " echo "$release_text" -exit + echo "[+] Pushing release to github" # Create release on github release_name="Substrate $version" @@ -79,6 +81,6 @@ formatted_msg_body=$(cat <