From 0ecf59f065d45d8fa8f1391e47d56916f7006419 Mon Sep 17 00:00:00 2001 From: Alex Carney Date: Sun, 22 Sep 2024 18:58:42 +0100 Subject: [PATCH] Align make-release.sh to 0.x branch --- scripts/make-release.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/make-release.sh b/scripts/make-release.sh index 768a67225..7297a2c02 100755 --- a/scripts/make-release.sh +++ b/scripts/make-release.sh @@ -95,8 +95,8 @@ TAG="${TAG_PREFIX}${VERSION}" DATE=$(date +%Y-%m-%d) -# Only if we are on the release branch. -if [ "${GITHUB_REF}" = "refs/heads/release" ]; then +# Only if we are on the 0.x branch. +if [ "${GITHUB_REF}" = "refs/heads/0.x" ]; then # Make sure there's at least some changes... if [ -z "$(find changes -name '*.rst')" ]; then @@ -112,16 +112,16 @@ if [ "${GITHUB_REF}" = "refs/heads/release" ]; then python -m towncrier build --yes --version="${VERSION}" # Setup git, commit, tag and push all the changes. - git config user.name github-actions - git config user.email github-actions@github.com + git config user.name 'github-actions[bot]' + git config user.email '41898282+github-actions[bot]@users.noreply.github.com' git commit -am "${COMMIT_MSG}${VERSION}" # Other stages may have run before this, make sure we have the latest - git pull --rebase origin release + git pull --rebase origin '0.x' git tag -a "${TAG}" -m "${COMMIT_MSG}${VERSION}" - git push origin release + git push origin '0.x' git push origin --tags # Create a markdown copy of the Changelog, needed for the VSCode marketplace.