Skip to content

[INFRA] Set up default rulesets for default and release branches #3491

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

Merged
Jens-G merged 1 commit into from
May 18, 2026
+14 −0
Merged

[INFRA] Set up default rulesets for default and release branches #3491

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions .asf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,20 @@ notifications:
jira_options: link label worklog

github:
rulesets:
- name: "Default Branch Protection"
type: branch
branches:
includes:
- "~DEFAULT_BRANCH"
- "release/*"
- "rel/*"
Copy link
Copy Markdown
Member

@kpumuk kpumuk May 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Jens-G we don't seem to use release/ or rel/, should we protect release tags v* instead? Or rather in addition to, so you can use release/0.24.0 for release work instead of 0.24.0

Copy link
Copy Markdown
Member

@ctubbsii ctubbsii May 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because some projects have subprojects (multiple releases, with different names), I think it's a good opportunity to start using better tag names instead of just the raw version numbers, as in rel/thrift-0.24.0. If there's any sub-projects, like "thrift-examples", then it could be rel/thrift-examples-1.0.0, for example.

Having all the releases under one tag namespace allows other kinds of tags to be used for other purposes in their own namespace that don't look like rel/ (e.g. release candidates, tests, abandoned branches, etc.)

Copy link
Copy Markdown
Member

@Jens-G Jens-G May 17, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we talking about branches or tags?
Don't forget to adjust the ReleaseManagement document. Done

- "0.*" # existing release branches are all 0.xx.xx
excludes: []
bypass_teams:
- root
restrict_deletion: true
restrict_force_push: true
autolink_jira:
- THRIFT
enabled_merge_buttons:
Expand Down
Loading