-
Notifications
You must be signed in to change notification settings - Fork 350
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Make "Update release branch" workflow fail if npm version
fails
#1197
Merged
henrymercer
merged 3 commits into
main
from
henrymercer/fix-release-when-package-conflicts
Aug 22, 2022
Merged
Make "Update release branch" workflow fail if npm version
fails
#1197
henrymercer
merged 3 commits into
main
from
henrymercer/fix-release-when-package-conflicts
Aug 22, 2022
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
3 tasks
Co-authored-by: Edoardo Pirovano <6748066+edoardopirovano@users.noreply.github.com>
edoardopirovano
approved these changes
Aug 19, 2022
aeisenberg
approved these changes
Aug 19, 2022
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, but would be good to add the whitespace change in first.
Co-authored-by: Andrew Eisenberg <aeisenberg@github.com>
6 tasks
4 tasks
This was referenced Apr 24, 2023
This was referenced Apr 24, 2023
This was referenced Apr 25, 2023
This was referenced Apr 25, 2023
This was referenced Jun 23, 2023
This was referenced Nov 30, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This fixes a bug in the "Update release branch" workflow that could occur when there are merge conflicts in
package.json
. These merge conflicts cause thenpm version
command to fail, but this failure was not causing the workflow itself to fail. As a result, we merged av2 -> v1
backport that did not update the version number inpackage.json
. The "Tag release and merge back" workflow subsequently did not update thev1
release tag, so thev1
release did not occur.As a fix, we use
subprocess.check_output
instead ofsubprocess.run
to check the exit code and fail the workflow if there are merge conflicts bad enough to prevent us from updating the package version.Merge / deployment checklist