Skip to content

Add branch protection and merge queue for rustup release branch - #2372

Closed
Kobzol wants to merge 2 commits into
rust-lang:mainfrom
Kobzol:rustup-release-merge-queue
Closed

Kobzol wants to merge 2 commits into
rust-lang:mainfrom
Kobzol:rustup-release-merge-queue

Conversation

@Kobzol

@Kobzol Kobzol commented Apr 2, 2026

Copy link
Copy Markdown
Member

Requested here.

CC @rami3l if it looks like what you want.

@github-actions

github-actions Bot commented Apr 2, 2026 •

Copy link
Copy Markdown
Dry-run check results

[WARN  rust_team::sync] sync-team is running in dry mode, no changes will be applied.
[INFO  rust_team::sync] synchronizing crates-io
[INFO  rust_team::sync] synchronizing github
[INFO  rust_team::sync] 💻 Repo Diffs:
    📝 Editing repo 'rust-lang/arewewebyet':
      Branch Protections:
          master
            Require branches to be up to date: false
            Dismiss Stale Reviews: false
            Is admin enforced: true
            Required Approving Review Count: 1
            Requires PR: true
            Required Checks: []
            Allowances: []
    📝 Editing repo 'rust-lang/async-fundamentals-initiative':
      Branch Protections:
          master
            Require branches to be up to date: false
            Dismiss Stale Reviews: false
            Is admin enforced: true
            Required Approving Review Count: 0
            Requires PR: true
            Required Checks: []
            Allowances: []
    📝 Editing repo 'rust-lang/book':
      Branch Protections:
          main
            Require branches to be up to date: false
            Dismiss Stale Reviews: false
            Is admin enforced: true
            Required Approving Review Count: 0
            Requires PR: true
            Required Checks: []
            Allowances: []
    📝 Editing repo 'rust-lang/calendar-generation':
      Branch Protections:
          main
            Require branches to be up to date: false
            Dismiss Stale Reviews: false
            Is admin enforced: true
            Required Approving Review Count: 1
            Requires PR: true
            Required Checks: []
            Allowances: []
    📝 Editing repo 'rust-lang/calendar':
      Branch Protections:
          main
            Require branches to be up to date: false
            Dismiss Stale Reviews: false
            Is admin enforced: true
            Required Approving Review Count: 0
            Requires PR: false
            Required Checks: []
            Allowances: []
    📝 Editing repo 'rust-lang/cargo-bisect-rustc':
      Branch Protections:
          master
            Require branches to be up to date: false
            Dismiss Stale Reviews: false
            Is admin enforced: true
            Required Approving Review Count: 0
            Requires PR: true
            Required Checks: []
            Allowances: []
    📝 Editing repo 'rust-lang/cmake-rs':
      Branch Protections:
          main
            Require branches to be up to date: true
            Dismiss Stale Reviews: false
            Is admin enforced: true
            Required Approving Review Count: 0
            Requires PR: true
            Required Checks: ["success"]
            Allowances: []
    📝 Editing repo 'rust-lang/compiler-team':
      Branch Protections:
          master
            Require branches to be up to date: false
            Dismiss Stale Reviews: false
            Is admin enforced: true
            Required Approving Review Count: 0
            Requires PR: true
            Required Checks: []
            Allowances: []
    📝 Editing repo 'rust-lang/ena':
      Branch Protections:
          master
            Require branches to be up to date: false
            Dismiss Stale Reviews: false
            Is admin enforced: true
            Required Approving Review Count: 1
            Requires PR: true
            Required Checks: []
            Allowances: []
    📝 Editing repo 'rust-lang/futures-rs':
      Branch Protections:
          master
            Require branches to be up to date: false
            Dismiss Stale Reviews: false
            Is admin enforced: true
            Required Approving Review Count: 0
            Requires PR: true
            Required Checks: []
            Allowances: []
    📝 Editing repo 'rust-lang/impl-trait-utils':
      Branch Protections:
          main
            Require branches to be up to date: false
            Dismiss Stale Reviews: false
            Is admin enforced: true
            Required Approving Review Count: 1
            Requires PR: true
            Required Checks: []
            Allowances: []
    📝 Editing repo 'rust-lang/leadership-council':
      Branch Protections:
          main
            Require branches to be up to date: false
            Dismiss Stale Reviews: false
            Is admin enforced: true
            Required Approving Review Count: 1
            Requires PR: true
            Required Checks: []
            Allowances: []
    📝 Editing repo 'rust-lang/llvm-project':
      Branch Protections:
          rustc/*
            Require branches to be up to date: false
            Dismiss Stale Reviews: false
            Is admin enforced: true
            Required Approving Review Count: 0
            Requires PR: false
            Required Checks: []
            Allowances: []
          master
            Require branches to be up to date: false
            Dismiss Stale Reviews: false
            Is admin enforced: true
            Required Approving Review Count: 0
            Requires PR: false
            Required Checks: []
            Allowances: []
    📝 Editing repo 'rust-lang/portable-simd':
      Branch Protections:
          master
            Require branches to be up to date: false
            Dismiss Stale Reviews: false
            Is admin enforced: true
            Required Approving Review Count: 0
            Requires PR: true
            Required Checks: []
            Allowances: []
    📝 Editing repo 'rust-lang/project-stable-mir':
      Branch Protections:
          main
            Require branches to be up to date: false
            Dismiss Stale Reviews: false
            Is admin enforced: true
            Required Approving Review Count: 1
            Requires PR: true
            Required Checks: []
            Allowances: []
    📝 Editing repo 'rust-lang/rfcs':
      Branch Protections:
          master
            Require branches to be up to date: false
            Dismiss Stale Reviews: false
            Is admin enforced: true
            Required Approving Review Count: 0
            Requires PR: true
            Required Checks: []
            Allowances: []
    📝 Editing repo 'rust-lang/rust-playground':
      Branch Protections:
          main
            Require branches to be up to date: false
            Dismiss Stale Reviews: false
            Is admin enforced: true
            Required Approving Review Count: 0
            Requires PR: true
            Required Checks: []
            Allowances: []
    📝 Editing repo 'rust-lang/rustc-demangle':
      Branch Protections:
          main
            Require branches to be up to date: true
            Dismiss Stale Reviews: false
            Is admin enforced: true
            Required Approving Review Count: 1
            Requires PR: true
            Required Checks: ["Fuzz Targets", "Publish Documentation", "Rustfmt", "Test (beta)", "Test (nightly)", "Test (stable)"]
            Allowances: []
    📝 Editing repo 'rust-lang/rustc-hash':
      Branch Protections:
          master
            Require branches to be up to date: false
            Dismiss Stale Reviews: false
            Is admin enforced: true
            Required Approving Review Count: 1
            Requires PR: true
            Required Checks: []
            Allowances: []
    📝 Editing repo 'rust-lang/rustc-stable-hash':
      Branch Protections:
          main
            Require branches to be up to date: false
            Dismiss Stale Reviews: false
            Is admin enforced: true
            Required Approving Review Count: 1
            Requires PR: true
            Required Checks: []
            Allowances: []
    📝 Editing repo 'rust-lang/rustc_codegen_c':
      Branch Protections:
          main
            Require branches to be up to date: true
            Dismiss Stale Reviews: false
            Is admin enforced: true
            Required Approving Review Count: 0
            Requires PR: true
            Required Checks: ["success"]
            Allowances: []
    📝 Editing repo 'rust-lang/rustup':
      Rulesets:
          Creating 'release/*'
            Include Branches: ["refs/heads/release/*"]
            Required status checks: conclusion (integration_id: 15368)
            Require merge queue: true
            Merge queue merge_method: Rebase
            Required approvals: 0
    📝 Editing repo 'rust-lang/std-dev-guide':
      Branch Protections:
          master
            Require branches to be up to date: true
            Dismiss Stale Reviews: false
            Is admin enforced: true
            Required Approving Review Count: 1
            Requires PR: true
            Required Checks: ["book-test"]
            Allowances: []
    📝 Editing repo 'rust-lang/this-week-in-rust':
      Branch Protections:
          main
            Require branches to be up to date: false
            Dismiss Stale Reviews: false
            Is admin enforced: true
            Required Approving Review Count: 0
            Requires PR: true
            Required Checks: []
            Allowances: []
    📝 Editing repo 'rust-lang/wg-async':
      Branch Protections:
          master
            Require branches to be up to date: false
            Dismiss Stale Reviews: false
            Is admin enforced: true
            Required Approving Review Count: 0
            Requires PR: true
            Required Checks: []
            Allowances: []
    📝 Editing repo 'rust-lang/wg-macros':
      Branch Protections:
          main
            Require branches to be up to date: false
            Dismiss Stale Reviews: false
            Is admin enforced: true
            Required Approving Review Count: 1
            Requires PR: true
            Required Checks: []
            Allowances: []

Comment thread repos/rust-lang/rustup.toml
Co-authored-by: Marco Ieni <11428655+marcoieni@users.noreply.github.com>
@marcoieni
marcoieni added this pull request to the merge queue Apr 2, 2026
github-merge-queue Bot pushed a commit that referenced this pull request Apr 2, 2026
Add branch protection and merge queue for rustup release branch
@github-merge-queue
github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Apr 2, 2026
@marcoieni

Copy link
Copy Markdown
Member

Error:

Body: "{\"message\":\"Validation Failed\",\"errors\":[\"Invalid rule 'merge_queue': Wildcard ref names are not supported when merge queue is enabled\"],\"documentation_url\":\"https://docs.github.com/rest/repos/rules#create-a-repository-ruleset\",\"status\":\"422\"}"

@Kobzol

Kobzol commented Apr 3, 2026

Copy link
Copy Markdown
Member Author

I swear that GitHub finds a way to make me mad with every new day.. :D

@Kobzol

Kobzol commented Apr 3, 2026

Copy link
Copy Markdown
Member Author

I guess it won't be possible to do this 😞 Unless we want to always modify team first and add a new branch protection when a new release is out...

@rami3l

rami3l commented Apr 3, 2026

Copy link
Copy Markdown
Member

@Kobzol Sorry to learn about that.

I think for now I can stand with not having the "merge queue" line for those branches, but I'd assume it'd still be helpful to merge the rest of the changes?

@Kobzol

Kobzol commented Apr 3, 2026

Copy link
Copy Markdown
Member Author

Is any of the following useful to you?

  • It won't be possible to delete the release branch.
  • A PR will be required for merging things into a release branch.

If yes, then it makes sense to still merge it.

@rami3l

rami3l commented Apr 3, 2026

Copy link
Copy Markdown
Member

Is any of the following useful to you?

  • It won't be possible to delete the release branch.
  • A PR will be required for merging things into a release branch.

@Kobzol Thanks for the clarification! Thinking about it again I think hmmm probably it's too early to say anything about it, we are still in the test phase after all (for example I'll need to delete/adjust the dummy release branch).

I guess it'd be better to close this for now then 😞 maybe I'll try to revive it when we have a conclusion. Many thanks nonetheless for working on this :)

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants