chore: point renovate.json at next, add main-branch guard#178
Merged
Conversation
Same root cause found and fixed in z-shell/zsh-eza this session: renovate.json had no baseBranches override, so Renovate defaulted to main, bypassing next the same way several past PRs (#171, #150-156) did. dependabot.yml was already fixed for this in #172; this brings Renovate in line with it and ADR-0008 (z-shell/.github). Also adds a required-status-check workflow that fails a PR targeting main unless its head branch is next or matches hotfix-*. Closes #177
Contributor
There was a problem hiding this comment.
Pull request overview
Aligns Renovate and repository workflow enforcement with the repo’s next -> main branching model by targeting Renovate PRs at next and adding an automated guard to prevent most direct PRs into main.
Changes:
- Configure Renovate to open PRs against
nextviabaseBranches. - Add a GitHub Actions workflow that fails PRs targeting
mainunless they originate fromnextorhotfix-*.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| renovate.json | Adds baseBranches: ["next"] so Renovate targets the integration branch instead of defaulting to main. |
| .github/workflows/main-branch-guard.yml | Introduces a PR guard workflow intended to block non-next/hotfix-* branches from targeting main. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+4
to
+7
| on: | ||
| pull_request: | ||
| branches: [main] | ||
| types: [opened, reopened, synchronize, edited] |
ss-o
added a commit
that referenced
this pull request
Jul 24, 2026
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.
Closes #177.
Same root cause found and fixed in z-shell/zsh-eza this session:
renovate.jsonhad nobaseBranchesoverride, so Renovate defaulted tomain, bypassingnextthe same way several past PRs (chore(deps): activate organization Renovate preset #171, chore(deps): update actions/checkout action to v4.2.2 #150-chore(deps): update all dependencies to v5 (major) #156) did.dependabot.ymlwas already fixed for this in Configure Dependabot updates to open PRs againstnext#172; this brings Renovate in line with it and ADR-0008 (z-shell/.github)..github/workflows/main-branch-guard.yml: a required-status-check workflow that fails a PR targetingmainunless its head branch isnextor matcheshotfix-*.nextwas found 1 commit behindmaindue to fix: validate zi repository identity before destructive git operations; automate checksum generation #176 merging directly from a non-next/hotfix-*branch; already fast-forwardednextto resolve that gap.This PR only adds the check. Wiring it into
main's ruleset as a required status check is a follow-up, once the check has run at least once on a real PR againstmain.Test plan
renovate.jsonvalidated withpython3 -m json.toolpython3 -c "import yaml; yaml.safe_load(...)"