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

Make "Merge when ready" button always "work" #172999

Closed
MikeMcQuaid opened this issue May 28, 2024 · 6 comments · Fixed by #173010
Closed

Make "Merge when ready" button always "work" #172999

MikeMcQuaid opened this issue May 28, 2024 · 6 comments · Fixed by #173010
Labels
bug Reproducible Homebrew/homebrew-core bug help wanted Task(s) needing PRs from the community or maintainers outdated PR was locked due to age

Comments

@MikeMcQuaid
Copy link
Member

MikeMcQuaid commented May 28, 2024

What were you trying to do (and why)?

It would be nice if the Homebrew/homebrew-core "Merge when ready" button always "just worked" i.e. it would intelligently know to push bottle commits to the PR if necessary and then attempt another merge later.

What happened (include all command output)?

People click the "merge when ready" button and it does the wrong thing e.g. not merge, not include bottles, etc.

What did you expect to happen?

The "merge when ready" button always merges when ready.

Step-by-step reproduction instructions (by running brew commands)

  • Press "merge when ready"
  • Sometimes: it does not do what you want/expect
@MikeMcQuaid MikeMcQuaid added bug Reproducible Homebrew/homebrew-core bug help wanted Task(s) needing PRs from the community or maintainers labels May 28, 2024
@Bo98
Copy link
Member

Bo98 commented May 30, 2024

Alternative thought: given merging requires approval, and approving itself triggers an automerge, we could make a status check that only passes once the bottle commit is added (or otherwise doesn't require a bottle commit) so that adding to the merge queue doesn't happen until that point.

@carlocab
Copy link
Member

Alternative thought: given merging requires approval, and approving itself triggers an automerge, we could make a status check that only passes once the bottle commit is added (or otherwise doesn't require a bottle commit) so that adding to the merge queue doesn't happen until that point.

Yes, @MikeMcQuaid had suggested this previously.

It's not my preferred solution since it makes status indicators on the PR list less informative. i.e. We don't know if a PR has an ❌ because it's failing or because it just has no bottles yet.

@Bo98
Copy link
Member

Bo98 commented May 31, 2024

Alternative thought: given merging requires approval, and approving itself triggers an automerge, we could make a status check that only passes once the bottle commit is added (or otherwise doesn't require a bottle commit) so that adding to the merge queue doesn't happen until that point.

Yes, @MikeMcQuaid had suggested this previously.

It's not my preferred solution since it makes status indicators on the PR list less informative. i.e. We don't know if a PR has an ❌ because it's failing or because it just has no bottles yet.

I would probably make it 🟡 rather than ❌ so failures show but yeah point noted for the ✅ case.

@carlocab
Copy link
Member

Yea, 🟡 is a lot more reasonable, and I would no longer opposed to it if we used 🟡. It would take some getting used to, though (but I can live with it if that's what others wanted to do).

@MikeMcQuaid
Copy link
Member Author

I think having "this PR is ready to be added to the merge queue" indicated with 🟢 rather than 🟡 or 🔴 is a much nicer experience.

@carlocab
Copy link
Member

I think having "this PR is ready to be added to the merge queue" indicated with 🟢 rather than 🟡 or 🔴 is a much nicer experience.

This is ready to go at #173010. Just needs another review since I had to rework the approach.

@github-actions github-actions bot added the outdated PR was locked due to age label Jul 1, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 1, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
bug Reproducible Homebrew/homebrew-core bug help wanted Task(s) needing PRs from the community or maintainers outdated PR was locked due to age
Projects
None yet
Development

Successfully merging a pull request may close this issue.

3 participants