Skip to content

pr.sh: refuse when main has no required checks #16

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
markope merged 1 commit into from
Oct 26, 2026
Merged

pr.sh: refuse when main has no required checks #16

Show file tree
Hide file tree
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
12 changes: 12 additions & 0 deletions scripts/pr.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,16 @@ release_title() {
[[ "$(printf '%s' "$1" | tr '[:upper:]' '[:lower:]')" == "release "* ]]
}

# Auto-merge waits for the required checks only where a ruleset demands them;
# without any, GitHub merges at once, untested. So both commands refuse.
require_checks() {
local n
n=$(gh api 'repos/{owner}/{repo}/rules/branches/main' \
--jq '[.[] | select(.type == "required_status_checks")] | length')
[ "${n:-0}" -gt 0 ] ||
die "main has no required checks: auto-merge would merge untested. Protect main first (a ruleset requiring ci-ok and security / report)."
}

open_pr() { # open_pr <branch>: number of the branch's open pull request, if any
gh pr list --head "$1" --state open --json number --jq '.[0].number // empty'
}
Expand Down Expand Up @@ -109,6 +119,7 @@ cmd_merge() {
die "merge: run on a feature branch"
fi
require_clean
require_checks
git fetch --quiet origin main
git merge-base --is-ancestor origin/main HEAD ||
die "merge: $branch does not contain origin/main (git rebase origin/main)"
Expand Down Expand Up @@ -138,6 +149,7 @@ cmd_release() {
shift 4
local base next tag title branch pr sha run
require_clean
require_checks
git fetch --quiet origin main
branch=$(git rev-parse --abbrev-ref HEAD)
if [ "$branch" = main ]; then
Expand Down
8 changes: 8 additions & 0 deletions scripts/test_pr.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ case "$1 $2" in
*) echo MERGED ;;
esac ;;
"run list") echo 42 ;;
"api repos/{owner}/{repo}/rules/branches/main") cat "$STUB/checks" 2>/dev/null || echo 2 ;;
"run watch") exit "$(cat "$STUB/watch" 2>/dev/null || echo 0)" ;;
esac
EOF
Expand Down Expand Up @@ -131,6 +132,13 @@ git -C "$repo" commit -q -m "a repository without a version"
check "merge: '-' for a repository without a version file" 0 merge - <<<"9.9.9"
expect "merge: '-' still opens the pull request" logged "gh pr create --base main --head feat"

setup VERSION 1.2.3
echo 0 >"$STUB/checks"
check "merge: refused when main has no required checks" 1 merge VERSION
check "release: refused when main has no required checks" 1 release patch x VERSION release.yml VERSION
expect "no required checks: nothing pushed, no pull request" not_logged "gh pr create"
expect "no required checks: the branch stays local" test -z "$(git -C "$origin" branch --list feat)"

setup VERSION 1.2.3
git -C "$repo" switch -q main
check "merge: refused on main" 1 merge VERSION
Expand Down
Loading