Skip to content

chore: update dev-kit and configure improved branch-protection - #455

Merged
olzemal merged 2 commits into
mainfrom
chore/improve-branch-protection
Aug 12, 2026
Merged

olzemal merged 2 commits into
mainfrom
chore/improve-branch-protection

Conversation

@olzemal

@olzemal olzemal commented Aug 10, 2026 •

Copy link
Copy Markdown
Contributor

What

related to https://github.com/opendefensecloud/odd-internal/issues/44

This PR updates the configured Github settings for the Solar repository.

In order to follow best practices regarding branch protection, we now have the following changes:

  • Org Admins no longer can bypass the protect-main ruleset
  • check lint test and CodeQL Checks need to succeed on the latest change in order for a PR to be merge-able
  • Reviewers approval is only valid if they approved the latest commit of a PR.
  • squash and rebase merges are now additionally prohibited.
  • The rules for main also apply for any release/* branches (currently none)

Testing

make repo-settings successfully applied the intended changes to the repo and the OpenSSF Scorecard now reports a 8/10 score for Branch-Protection.

Checklist

  • Tests added/updated n/a
  • No breaking changes (or upgrade path documented above)
  • Readable commit history (squashed and cleaned up as desired)
  • AI code review considered and comments resolved

Summary by CodeRabbit

  • Chores
    • Updated the development toolkit to the latest supported version.
    • Added configuration options for repository branch protection, including review requirements, status checks, branch rules, merge strategies, and approval settings.

@coderabbitai

coderabbitai Bot commented Aug 10, 2026 •

Copy link
Copy Markdown

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro Plus

Run ID: 38922841-82ae-40c7-a1f8-6b19370cbad7

📥 Commits

Reviewing files that changed from the base of the PR and between 9ed2254 and f71a442.

📒 Files selected for processing (1)
  • Makefile
🚧 Files skipped from review as they are similar to previous changes (1)
  • Makefile

📝 Walkthrough

Walkthrough

The Makefile updates the Dev Kit version from v1.0.11 to v1.0.13 and adds repository branch protection configuration variables.

Changes

Makefile configuration

Layer / File(s) Summary
Dev Kit and branch protection configuration
Makefile
The Dev Kit version changes to v1.0.13. New variables define administrator bypass, review requirements, status checks, branch scope, merge methods, and last-push approval.

Estimated code review effort: 2 (Simple) | ~10 minutes

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Title check ✅ Passed The title clearly summarizes both main changes: updating the dev-kit and improving branch protection.
Description check ✅ Passed The description covers the change, motivation, testing, and checklist, but it omits the explicit Why and Notes for reviewers headings.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch chore/improve-branch-protection

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@coveralls

coveralls commented Aug 10, 2026 •

Copy link
Copy Markdown

Coverage Report for CI Build 31575343096

Coverage increased (+0.7%) to 84.852%

Details

  • Coverage increased (+0.7%) from the base build.
  • Patch coverage: No coverable lines changed in this PR.
  • No coverage regressions found.

Uncovered Changes

No uncovered changes found.

Coverage Regressions

No coverage regressions found.


Coverage Stats

Coverage Status
Relevant Lines: 944
Covered Lines: 801
Line Coverage: 84.85%
Coverage Strength: 1620.04 hits per line

💛 - Coveralls

@olzemal
olzemal force-pushed the chore/improve-branch-protection branch from 00230f5 to 9ed2254 Compare August 10, 2026 12:17
@olzemal
olzemal marked this pull request as ready for review August 10, 2026 15:06

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@Makefile`:
- Line 2: Consolidate the Dev Kit version by aligning DEV_KIT_VERSION with every
opendefensecloud/dev-kit action reference in the listed workflows. Use the
intended single version, update each workflow’s action tag and regenerate its
corresponding SHA pin, ensuring the Makefile and all workflow pins remain
consistent.
🪄 Autofix

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro Plus

Run ID: 2c2a89c4-3c68-42c4-90de-a5a2d9701483

📥 Commits

Reviewing files that changed from the base of the PR and between c492b67 and 9ed2254.

📒 Files selected for processing (1)
  • Makefile

Comment thread Makefile
@olzemal
olzemal force-pushed the chore/improve-branch-protection branch from 9ed2254 to fbd3732 Compare August 11, 2026 06:00

@cbrgm cbrgm left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@olzemal
olzemal merged commit 82e2091 into main Aug 12, 2026
18 checks passed
@olzemal
olzemal deleted the chore/improve-branch-protection branch August 12, 2026 08:06
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.

4 participants