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.

Sign up for GitHub

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

Jump to bottom

Verify that backported commits are backports #74721

Closed
Mark-Simulacrum opened this issue Jul 24, 2020 · 1 comment · Fixed by #87604
Closed

Verify that backported commits are backports #74721

Mark-Simulacrum opened this issue Jul 24, 2020 · 1 comment · Fixed by #87604
Assignees
@yaymukund
Labels
E-help-wanted Call for participation: Help is requested to fix this issue. E-medium Call for participation: Medium difficulty. Experience needed to fix: Intermediate. T-release Relevant to the release subteam, which will review and decide on the PR/issue.

Comments

@Mark-Simulacrum
Copy link
Member

Mark-Simulacrum commented Jul 24, 2020 •
edited by rustbot
Loading

The 1.45.1 release is primarily being made because of the accidental omission of a rustfmt backport from the 1.45 beta branch after it landed in 1.44.1.

The release team discussed this today, and we'd like to implement some automation to try and prevent this in the future at relatively low cost.

The plan is to only allow landing commits in beta / stable branches if git cherry (or similar, but that seems like the right thing) indicates they've already landed in the preceding branches (beta and master for stable, just master for beta). We will also want an explicit set of commits that are just allowed.

This will slightly increase the work needed during beta backports, as this list will need updating if there are any merge conflicts at least -- but since backports are rare and usually rollups, this shouldn't be much of a problem hopefully.

We would be interested in seeing someone implement this functionality!
@Mark-Simulacrum Mark-Simulacrum added E-help-wanted Call for participation: Help is requested to fix this issue. E-medium Call for participation: Medium difficulty. Experience needed to fix: Intermediate. T-release Relevant to the release subteam, which will review and decide on the PR/issue. labels Jul 24, 2020
@yaymukund
Copy link
Contributor

@rustbot claim

@yaymukund yaymukund mentioned this issue Jul 29, 2021
Closed
@yaymukund yaymukund mentioned this issue Jul 29, 2021
Merged
yaymukund pushed a commit to yaymukund/rust that referenced this issue Aug 20, 2021
CI: Verify commits in beta & stable are in upstream branches.
eda6649 
Closes rust-lang#74721
jackh726 added a commit to jackh726/rust that referenced this issue Aug 22, 2021
@jackh726
Rollup merge of rust-lang#87604 - yaymukund:verify-backported-commits…
8660e3d 
…, r=Mark-Simulacrum

CI: Verify commits in beta & stable are in upstream branches.

Closes rust-lang#74721

I think this does the trick. rust-lang#87597 is an example of it failing as it should.
@bors bors closed this as completed in 700b64e Aug 22, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@yaymukund yaymukund

Labels
E-help-wanted Call for participation: Help is requested to fix this issue. E-medium Call for participation: Medium difficulty. Experience needed to fix: Intermediate. T-release Relevant to the release subteam, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

CI: Verify commits in beta & stable are in upstream branches. yaymukund/rust
2 participants
@yaymukund @Mark-Simulacrum