Skip to content

Failed CP's can break our CI/CD #6863

Closed

Description

@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

Activity

  1. added
    ImprovementItem broken or needs improvement.
    InternalRequires API changes or must be handled by Expensify staff
    on Dec 21, 2021
  2. self-assigned this
    on Dec 21, 2021
  3. roryabraham commented on Jan 4, 2022

    @roryabraham
    ContributorAuthor

    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"

  4. roryabraham commented on Jan 18, 2022

    @roryabraham
    ContributorAuthor

    No update here

  5. roryabraham commented on Jan 29, 2022

    @roryabraham
    ContributorAuthor

    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.

  6. 52 remaining items

  7. melvin-bot commented on Jun 5, 2023

    @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.

  8. NajiNazzal commented on Aug 7, 2023

    @NajiNazzal

    Can I register?

  9. melvin-bot commented on Aug 7, 2023

    @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.
      Screen Shot 2022-11-16 at 4 42 54 PM
      Format:
    Contributor details
    Your Expensify account email: <REPLACE EMAIL HERE>
    Upwork Profile Link: <REPLACE LINK HERE>
    
  10. NajiNazzal commented on Aug 7, 2023

    @NajiNazzal

    Contributor details
    Your Expensify account email: najinazzal98@gmail.com
    Upwork Profile Link: https://www.upwork.com/freelancers/~01a352a7b4bf7c67cd

  11. melvin-bot commented on Aug 7, 2023

    @melvin-bot

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

  12. melvin-bot commented on Aug 21, 2023

    @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.

  13. melvin-bot commented on Nov 20, 2023

    @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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions