Skip to content

Commit

Permalink
Merge #10702
Browse files Browse the repository at this point in the history
10702: Prep for real 3.40.0 release r=AaronFriel a=AaronFriel

This turns the "safeties off" after validating the bors workflow and ensuring everything up to the dispatch commands succeeds.

It also fixes an error in `get-next-version` that resulted in the "vNext" PR #10701 to calculate the wrong "next version", which was corrected by hand. (The branch name and commit history is evidence of the error.)

Co-authored-by: Aaron Friel <mayreply@aaronfriel.com>
  • Loading branch information
bors[bot] and AaronFriel committed Sep 14, 2022
2 parents d42db65 + d51c54a commit ac0a010
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .github/scripts/get-next-version
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ if [[ "${PREVIOUS_VERSION}" = *-*.* ]]; then
VERSION="${PREVIOUS_VERSION%.*}.$((${PREVIOUS_VERSION##*.} + 1))"
else
IFS=. read -r major minor rest <<< "${PREVIOUS_VERSION}"
VERSION="TAG=${major}.$((minor + 1)).0"
VERSION="${major}.$((minor + 1)).0"
fi

echo -n "$VERSION"
1 change: 1 addition & 0 deletions .github/workflows/on-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,5 @@ jobs:
version: ${{ needs.info.outputs.version }}
next-version: ${{ needs.info.outputs.next-version }}
release-notes: ${{ github.event.release.body }}
run-dispatch-commands: true
secrets: inherit

0 comments on commit ac0a010

Please sign in to comment.