Skip to content

Commit be48754

Browse files
authored
Fix post-release.sh for git pull (#1938)
Adds a workaround for the error in https://github.com/getsentry/publish/actions/runs/4018136005 (not sure if this is fool-proof but it follows the suggestion in the output)
1 parent 30773e0 commit be48754

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

scripts/post-release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
55
cd $SCRIPT_DIR/..
66

77
# Bring master back to nightlies after merge from release branch
8-
git checkout master && git pull
8+
git checkout master && git pull --rebase
99
SYMBOLICATOR_VERSION=nightly ./scripts/bump-version.sh '' 'nightly'
1010
git diff --quiet || git commit -anm $'build: Set master version to nightly\n\n#skip-changelog' && git pull --rebase && git push

0 commit comments

Comments
 (0)