-
Notifications
You must be signed in to change notification settings - Fork 3k
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
Add comment when update protected branch fails #6706
Conversation
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.
Technically I think we can force updateProtectedBranch
to fail by:
- With the deploy checklist locked, merge and CP a pull request with some change in a specific file.
- Merge and CP another PR changing that same file.
- This should cause a merge conflict on staging when you go to CP the second PR to staging, which would fail the
updateProtectedBranch
workflow.
Co-authored-by: Rory Abraham <47436092+roryabraham@users.noreply.github.com>
Co-authored-by: Rory Abraham <47436092+roryabraham@users.noreply.github.com>
Co-authored-by: Rory Abraham <47436092+roryabraham@users.noreply.github.com>
Updated! I'll test once merged, thank you for the help coming up with the test steps. |
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.
Code LGTM. I think I might've been wrong about the test steps though – even if we have a merge conflict, I think we'll just commit the <== HEAD
diff stuff, and then theoretically the PR would be mergeable. So actually I'm not sure how we reproduce an unmergable PR 🤷
@puneetlath did you want to review this one? |
I don't have a lot of context or knowledge in this area, but I took a look and it seems to make sense. Thanks for giving me the opportunity! |
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
🚀 Deployed to staging by @puneetlath in version: 1.1.20-3 🚀
|
🚀 Deployed to production by @Julesssss in version: 1.1.21-1 🚀
|
Details
Adds a comment when the deploy process fails for the mobile deployer to fix the error and merge the PR to continue the deploy process.
Fixed Issues
$ https://github.com/Expensify/Expensify/issues/185234
Tests