Skip to content
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

Closed
wants to merge 1 commit into from
Closed

fix(ci): fetch remote changes before pushing ref and tag with shipjs #3533

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ship.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@ module.exports = {
pullRequestTeamReviewers: ['frontend-experiences-web'],
buildCommand: ({ version }) =>
`NODE_ENV=production VERSION=${version} yarn build`,
// 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'),
Comment on lines +60 to +63
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this change maybe be made in shipjs itself?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right, that would be better. I'll apply the fix there.

slack: {
// disable slack notification for `prepared` lifecycle.
// Ship.js will send slack message only for `releaseSuccess`.
Expand Down