fix: dco merge skip, dependabot docs, token perms tightening + rebase helper for best scorecard#350
Merged
Conversation
… helper for best scorecard - Update DCO to skip merge commits (in addition to bots). Safe for CI-Tests/Branch-Protection because we squash-merge and this only affects transient update commits. Reduces babysitting. - Add detailed "Handling Dependabot PRs" section to AGENTS.md with exact rebase process and rationale for preserving Scorecard 9->10 trajectory (CI-Tests=10, Dependency-Update-Tool=10, etc.). - Tighten/annotate permissions in auto-approve, dependabot-auto-merge, backport, sign-old-releases to address Token-Permissions warns. - Add scripts/rebase-dependabot.sh (shellcheck-clean) as the low-risk canonical way to update branches without merge commits. - Updated workflow NOTES to reference the guidance. None of these regress Branch-Protection, CI-Tests, or Token-Permissions. Auto-rebase job and broad CI skips were deliberately avoided per prior analysis. Closes the recurring "babysit dependabot" pattern while aiming for maximal Scorecard. Signed-off-by: Sebastien Tardif <sebtardif@ncf.ca>
30c0dec to
f678701
Compare
Contributor
Author
|
Rebased cleanly onto latest
No reviews yet. This should unblock the Dependabot babysitting issues long-term while keeping high Scorecard (CI-Tests, Branch-Protection, Token-Permissions). Let me know if any adjustments needed! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Implements all the safe improvements discussed for Dependabot friction while explicitly protecting (and documenting how to protect) the best possible OpenSSF Scorecard.
Changes:
[bot]authors (transient only because of squash-merge policy).scripts/rebase-dependabot.sh(shellcheck clean) — the low-risk canonical helper.No risky changes were made:
Scorecard impact
All changes are neutral-to-positive for the checks that matter:
How to review
scripts/rebase-dependabot.sh --help(or just read it).See commit for full details.
Closes the recurring babysitting pattern for Dependabot while aiming for Scorecard 10.