ci: fix release job (git pull tracking) so Automated Release doesn't fail#35
Merged
Conversation
The reset step did 'git checkout -B release/next', an upstream-less branch, so the action's internal 'git pull --ff-only' failed ('no tracking information'). Stay on master (has tracking); the action pushes the release commit to release/next via its git-branch input. Also delete the merged release/next after auto-merge.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Follow-up to #34. The release job did
git checkout -B release/next(no upstream), so the changelog action'sgit pull --ff-onlyfailed at setup - Automated Release errored on the #34 merge. Fix: stay on master (has tracking); the action pushes torelease/nextvia itsgit-branchinput. Adds--delete-branchon auto-merge.ci:commit, so merging it won't cut a release - it should make Automated Release skip cleanly instead of failing.