This repository has been archived by the owner on Dec 30, 2022. It is now read-only.
fix(ci): fetch remote changes before pushing ref and tag with shipjs #3533
Conversation
This file contains 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
dhayab
requested review from
a team,
FabienMotte and
sarahdayan
and removed request for
a team
|
This pull request is automatically built and testable in CodeSandbox. To see build info of the built libraries, click here or the icon next to each commit SHA. Latest deployment of this branch, based on commit 0b54825:
|
✅ Deploy Preview for react-instantsearch ready!
To edit notification comments on pull requests, go to your Netlify site settings. |
Haroenv
reviewed
Jun 21, 2022
Comment on lines
+60
to
+63
| // Make sure the local branch is in sync with remote | ||
| // before pushing the ref and the tag on it | ||
| afterPublish: ({ exec }) => | ||
| exec('git fetch && git rebase origin/master master'), |
There was a problem hiding this comment.
should this change maybe be made in shipjs itself?
There was a problem hiding this comment.
You're right, that would be better. I'll apply the fix there.
|
Moved fix to algolia/shipjs#983. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Summary
On rare occasions, the release process orchestrated by Ship.js cannot be completed if the local main branch and its remote counterpart are not in sync, when an unrelated PR is merged just after a release is started for instance (see most recent example).
This is not critical, but it can be a bother as the latest git tag won't be pushed to the remote, and the releases list on GitHub will not be updated too.
This PR addresses the issue by performing a rebase onto the main branch in order to sync them before performing the git tag operation.
Result
The release process should now be more resilient to this kind of issue.