Skip to content

ci: add OSPO branch protection and environment-scoped workflows#25

Closed
jung-thomas wants to merge 2 commits into
mainfrom
ospo-branch-protection
Closed

ci: add OSPO branch protection and environment-scoped workflows#25
jung-thomas wants to merge 2 commits into
mainfrom
ospo-branch-protection

Conversation

@jung-thomas

Copy link
Copy Markdown
Contributor

Adds repo ruleset on main (PR + CI test check required, blocks force-push and deletion, admin bypass). Wires publishing/secret-using workflows to GitHub Environments: release.yml -> release, sign-windows.yml + release-tray.yml -> signing (required reviewer), news-sync.yml -> news-sync. Documents the new approval gate in the CLAUDE.md release section.

Follow-up (manual): scope SIGNPATH_* secrets to the signing environment and YOUTUBE_API_KEY to the news-sync environment.

Adds repo ruleset on `main` (PR + CI `test` check required, blocks
force-push and deletion, admin bypass). Wires publishing/secret-using
workflows to GitHub Environments: release.yml -> release,
sign-windows.yml + release-tray.yml -> signing (required reviewer),
news-sync.yml -> news-sync. Documents the new approval gate in the
CLAUDE.md release section.

Follow-up (manual): scope SIGNPATH_* secrets to the signing
environment and YOUTUBE_API_KEY to the news-sync environment.
Signed-off-by: Thomas Jung <thomas.jung@sap.com>
@jung-thomas jung-thomas enabled auto-merge June 12, 2026 16:30
@jung-thomas

Copy link
Copy Markdown
Contributor Author

Superseded by a follow-up PR that addresses the actual OSPO findings (deadline 16 June 2026):

  • Adds the three flagged controls: dismiss_stale_reviews_on_push, require_last_push_approval, required_review_thread_resolution.
  • Uses bypass_mode: pull_request instead of always for the admin bypass — admins can skip the new review/resolution checks for emergency merges, but the 1-approval rule still applies (narrower Control 5 regression).

Closing this in favor of the new PR.

auto-merge was automatically disabled June 12, 2026 16:37

Pull request was closed

@qmacro

qmacro commented Jun 12, 2026

Copy link
Copy Markdown
Contributor

For the branch protection (GitHub Hardening Control 5) you could, as an alternative, just add this repo to the list in this ruleset (see the email I sent the other day).

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.

2 participants