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
chore: point renovate.json at next, add main-branch guard
Contributor
There was a problem hiding this comment.
Pull request overview
Promotes operational/configuration fixes from next into main by aligning Renovate’s targeting behavior with the repo’s branching model and adding a CI guard to prevent unintended PRs into main.
Changes:
- Configure Renovate to open update PRs against
nextviabaseBranches. - Add a GitHub Actions workflow that fails PRs targeting
mainunless they come fromnextorhotfix-*.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
renovate.json |
Directs Renovate to use next as the base branch for update PRs. |
.github/workflows/main-branch-guard.yml |
Adds a PR-targeting guard workflow to enforce the next/hotfix-* source-branch policy for PRs into main. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
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.
Promotes next to main: PR #176's fix (already fast-forwarded from main to next earlier) plus #178 (renovate.json baseBranches, main-branch-guard workflow).