Skip to content
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

Incorrect CP messages are showing up #46442

Closed
luacmartins opened this issue Jul 29, 2024 · 12 comments
Closed

Incorrect CP messages are showing up #46442

luacmartins opened this issue Jul 29, 2024 · 12 comments
Assignees
Labels
Bug Something is broken. Auto assigns a BugZero manager. Reviewing Has a PR in review Weekly KSv2

Comments

@luacmartins
Copy link
Contributor

luacmartins commented Jul 29, 2024

Problem

We ran a CP for this PR, but it seems like we got duplicated CP messages added to two different issues for the same staging version.

It seems like all issues in the checklist got the cherry pick comment, instead of the deploy one

Additionally, it seems like we auto-assigned Chirag to the checklist for whatever reason.
Screenshot 2024-07-29 at 3 57 02 PM

Solution

Investigate

@luacmartins luacmartins added Daily KSv2 Bug Something is broken. Auto assigns a BugZero manager. labels Jul 29, 2024
Copy link

melvin-bot bot commented Jul 29, 2024

Triggered auto assignment to @greg-schroeder (Bug), see https://stackoverflow.com/c/expensify/questions/14418 for more details. Please add this bug to a GH project, as outlined in the SO.

@roryabraham
Copy link
Contributor

The problem is that this variable only looks at the tag for the deploy. However, sometimes deploys are "batched" with deploys because of this cancel-in-progress key.

So we really need to look at another piece of data to determine if a PR is being CP'd or deployed via the normal process.

@roryabraham
Copy link
Contributor

Got #46535 prettymuch ready, but I'd like to wait for some CP'd merge commits to appear on staging so I can double-check what the commit messages look like before I put that PR in for review

@roryabraham
Copy link
Contributor

Sample commit message for a CP'd PR, pulled from staging log (had to do it after CP'ing some stuff because full staging deploys delete these commits and replace them with whatever's on main)

Merge pull request #46679 from neonbhai/selection-dropdown-fix
    
Fix: Dropdown button is not disabled when no selection is made
(cherry picked from commit 7b1b260ee9ed71e253e25642f95d362d70259368)

@melvin-bot melvin-bot bot added the Overdue label Aug 5, 2024
@greg-schroeder
Copy link
Contributor

PR still in progress

@melvin-bot melvin-bot bot removed the Overdue label Aug 5, 2024
@roryabraham
Copy link
Contributor

ok, I've gotten this to the point where we can see which PRs were CP'd and in what versions. However, now we need a way to determine who actually triggered the CP workflow.

I tried listing cherryPick workflow runs but it doesn't seem like there's really a way to associate runs with a version. meanwhile, all platformDeploy runs are triggered by OSBotify

So my best idea right now is to try and update the cherryPick workflow to run the CP commits as the deployer, not OSBotify. But that could have all kinds of side-effects that would need to be carefully considered 😬

@melvin-bot melvin-bot bot added the Overdue label Aug 7, 2024
Copy link

melvin-bot bot commented Aug 8, 2024

@greg-schroeder, @roryabraham Whoops! This issue is 2 days overdue. Let's get this updated quick!

@roryabraham
Copy link
Contributor

update the cherryPick workflow to run the CP commits as the deployer, not OSBotify

Looks like we're already trying to do this, but it doesn't look like it's working: 8d2f90b

@melvin-bot melvin-bot bot added Reviewing Has a PR in review Weekly KSv2 and removed Overdue Daily KSv2 labels Aug 8, 2024
@roryabraham
Copy link
Contributor

ok, chatted with @francoisl and we came up with a clever solution. PR ready for review

@roryabraham
Copy link
Contributor

PR merged

@greg-schroeder
Copy link
Contributor

Thanks @roryabraham! Awaiting deploy to staging -> prod

@roryabraham
Copy link
Contributor

This should be fixed now

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Something is broken. Auto assigns a BugZero manager. Reviewing Has a PR in review Weekly KSv2
Projects
None yet
Development

No branches or pull requests

3 participants