Failed CP's can break our CI/CD

[roryabraham]

Action Performed:

1. Merge a dummy PR.
2. Create a revert PR for that dummy PR.
3. Give the revert PR the CP Staging label.
4. Merge the revert PR.
5. You'll observe that the app version on the deploy checklist increases. (BUG)
6. There should be a merge conflict with the CP PR.
7. Close the CP PR without resolving conflicts or merging it.
8. Then without running any other CP's first, close the checklist to run a production deploy.

Expected Result:

The production and staging deploys should complete successfully, and we should have a new checklist.

Actual Result:

The production and staging deploys complete successfully, but creating a new checklist fails with the following type of error:

Found tag of previous StagingDeployCash: 1.1.22-1
Getting pull requests merged between the following refs: 1.1.22-1 1.1.22-2
Running command:  git log --format="{[%B]}" 1.1.22-1...1.1.22-2
fatal: ambiguous argument '1.1.22-1...1.1.22-2': unknown revision or path not in the working tree.

Where in this case 1.1.22-1 is the tag that was posted in the deploy checklist, but never actually created.

Workaround:

DANGER:

1. Manually update the checklist to have the tag matching the latest production deploy (GitHub Release).
2. Re-run the finishReleaseCycle.yml workflow
3. IMPORTANT NOTE: This will attempt to deploy all the code from staging to production. It's imperative that you manually kill the workflow before that happens. It's best to kill the updateProtectedBranch workflow that's attempting to merge the code from staging -> production, but if you're too slow then you can kill the deploy.yml or platformDeploy.yml as well.

Platform:

GitHub Actions

[roryabraham]

We've seen similar problem that suggests a similar solution to this, namely: "Only update the app version on the StagingDeployCash once the tag has been created and pushed"

[roryabraham]

No update here

[roryabraham]

Another good improvement to make once pascalgn/automerge-action#177 is merged would be to delete the unmerged PR branch if the automerge-action fails.

[roryabraham]

No update

[roryabraham]

No update

[roryabraham]

This is a pretty rare edge case that requires some human error to reproduce it (i.e: begin a CP but don't finish it). Going to move this to monthly and send it back to the pool for now. Would still be good to fix someday.

[melvin-bot]

@roryabraham, this Monthly task hasn't been acted upon in 6 weeks; closing.

If you disagree, feel encouraged to reopen it -- but pick your least important issue to close instead.

[roryabraham]

This is a a bug, not a new feature.

This isn't a bug that a user would experience

the "user" in this case is a deployer

[thienlnam]

@roryabraham I've started to look into this (Slack Thread)

I am a little unsure how to proceed since this cherry pick action fails when there is some kind of merge conflict and needs to be merged manually.

But this workflow only breaks when we abort the CP and not even merge manually right? So if we were to move the logic to bump the version in the checklist to after it was successful or when the manual PR was merged - would it even be possible to check that it was a manual merge?

[thienlnam]

Going to unassign this for now, having a hard time allocating time to look into this - might be better suited for an external agency since it's front-end

[melvin-bot]

@roryabraham, this Monthly task hasn't been acted upon in 6 weeks; closing.

If you disagree, feel encouraged to reopen it -- but pick your least important issue to close instead.

[NajiNazzal]

Can I register?

[melvin-bot]

📣 @NajiNazzal! 📣
Hey, it seems we don’t have your contributor details yet! You'll only have to do this once, and this is how we'll hire you on Upwork.
Please follow these steps:

1. Get the email address used to login to your Expensify account. If you don't already have an Expensify account, create one here. If you have multiple accounts (e.g. one for testing), please use your main account email.
2. Get the link to your Upwork profile. It's necessary because we only pay via Upwork. You can access it by logging in, and then clicking on your name. It'll look like this. If you don't already have an account, sign up for one here.
3. Copy the format below and paste it in a comment on this issue. Replace the placeholder text with your actual details.
   
   Format:

Contributor details
Your Expensify account email: <REPLACE EMAIL HERE>
Upwork Profile Link: <REPLACE LINK HERE>

[NajiNazzal]

Contributor details
Your Expensify account email: [email protected]
Upwork Profile Link: https://www.upwork.com/freelancers/~01a352a7b4bf7c67cd

[melvin-bot]

✅ Contributor details stored successfully. Thank you for contributing to Expensify!

[melvin-bot]

@roryabraham, this Monthly task hasn't been acted upon in 6 weeks; closing.

If you disagree, feel encouraged to reopen it -- but pick your least important issue to close instead.

[melvin-bot]

@roryabraham, this Monthly task hasn't been acted upon in 6 weeks; closing.

If you disagree, feel encouraged to reopen it -- but pick your least important issue to close instead.