[No QA] Resolve CP merge conflicts #3350
Merged
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
AndrewGable
reviewed
Jun 3, 2021
.github/workflows/cherryPick.yml
Outdated
| run: | | ||
| git add -A | ||
| git cherry-pick --continue | ||
| if [[ "$(./.github/scripts/cherryPick.sh ${{ steps.getCPMergeCommit.outputs.MERGE_COMMIT_SHA }})" ]]; then |
There was a problem hiding this comment.
Did we test this line somehow? It looks like there is a few gotchas that could break this.
There was a problem hiding this comment.
No, we didn't test it. I can try to do something similar in Public-Test-Repo to validate this a bit.
There was a problem hiding this comment.
Did some testing here, found one potential issue/simplification with the syntax here.
ctkochan22
previously approved these changes
Jun 3, 2021
AndrewGable
reviewed
Jun 4, 2021
|
Updated! All the bash is inlined in the workflow now |
AndrewGable
approved these changes
Jun 4, 2021
|
✋ 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 in version: 1.0.63-1🚀
|
|
🚀 Deployed to production in version: 1.0.64-0🚀
|
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.
Details
More context starting here, but in broad strokes this PR will:
package.json,package-lock.json, etc... that contain the higher version (i.e: the branch we're CPing into staging, hence the use of-Xtheirs).deploy.ymlsuch that it will deploy to staging when any PR created byOSBotifyis merged by anyone, where before it would only deploy to staging when any PR was merged byOSBotify.actions-ecosystem/get-merged-pull-request. PR here.Fixed Issues
Fixes https://github.com/Expensify/Expensify/issues/155229
Tests
StagingDeployCashCP Staginglabel). Call this PR A. As per usual, it should not be deployed or added to theStagingDeployCash. A comment should appear on the PR stating that it will be deployed later.CP Staginglabel on the PR. Call this PR B. A new version should be created and merged to main, and thepreDeployworkflow should synchronously execute thecherryPick.ymlworkflow.StagingDeployCash, but PR A was not.StagingDeployCash.CP Staginglabel so the reverts are CP'd to staging. Merge them both to CP them to staging.StagingDeployCashto run a prod deploy. Verify that the latest staging version is deployed to production.