diff --git a/.github/scripts/release.sh b/.github/scripts/release.sh index 2025d4d8a..e0984dde8 100755 --- a/.github/scripts/release.sh +++ b/.github/scripts/release.sh @@ -136,7 +136,7 @@ git commit -m "[Automated] Bump dev version to ${CANDIDATE}" if [ -z "$DRYRUN" ]; then BUMP_BRANCH="automated/bump-${CANDIDATE//./-}" git checkout -b "$BUMP_BRANCH" - git push --set-upstream origin "$BUMP_BRANCH" + git push --force-with-lease --set-upstream origin "$BUMP_BRANCH" REPO="${GITHUB_REPOSITORY:-$(git remote get-url origin | sed 's|.*github.com[:/]\(.*\)\.git|\1|')}" BUMP_PR_URL="https://github.com/${REPO}/compare/${BRANCH}...${BUMP_BRANCH}?quick_pull=1&title=%5BAutomated%5D+Bump+dev+version+to+${CANDIDATE}" echo "BUMP_PR_URL=$BUMP_PR_URL" >> "${GITHUB_OUTPUT:-/dev/null}"