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

Auto-milestoning uses incorrect milestone on rollups near version bump #1842

Open
ehuss opened this issue Sep 12, 2024 · 0 comments
Open

Auto-milestoning uses incorrect milestone on rollups near version bump #1842

ehuss opened this issue Sep 12, 2024 · 0 comments
Labels
A-milestone Area: automatic milestoning

Comments

@ehuss
Copy link
Contributor

ehuss commented Sep 12, 2024

The auto-milestoning feature will tag PRs with the wrong milestone when they are part of a rollup that is created/merged around the time that the version gets bumped.

The problem is here. It uses the SHA of the merge commit of the PR. This works for normal PRs since the merge commit is the one generated when the PR goes through bors. However, for rollups, this SHA is the merge commit of the rollup itself. This SHA is generated when the rollup is created, not when it gets merged.

Thus if there is a sequence:

  1. Rollup created
  2. Version bump gets merged
  3. Rollup is merged

The code will use the milestone version from the point in time of step 1, when it should be step 3.

One possible solution is for triagebot to notice that the PR was merged as part of a rollup, and use the parent of that merge commit instead. I'm not sure if there is a simple way to get that answer. Typically I would use something like git merge-base, but I don't know what options we have with the GitHub API.

@ehuss ehuss added the A-milestone Area: automatic milestoning label Sep 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-milestone Area: automatic milestoning
Projects
None yet
Development

No branches or pull requests

1 participant