Skip to content

chore(next): promote fixes to main - #184

Merged
ss-o merged 6 commits into
mainfrom
next
Aug 16, 2026
Merged

chore(next): promote fixes to main#184
ss-o merged 6 commits into
mainfrom
next

Conversation

@ss-o

@ss-o ss-o commented Aug 16, 2026

Copy link
Copy Markdown
Member

Promotes 6 commits from next: SH_WORD_SPLIT init default fix (#181), zsh-lint reference-corpus CI gate (#182), AGENTS.md standardization, and Renovate/main-branch-guard config. Includes the reconcile-main-into-next merge from the prior promotion (#183).

Diff: main...next

ss-o and others added 6 commits July 24, 2026 09:09
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
Co-authored-by: Sal <ss-o@users.noreply.github.com>
* ci: enforce zsh-lint reference corpus

* fix(ci): pin deadlock-free zsh-lint workflow

* fix(ci): disable zsh-lint workflow cache warnings

---------

Co-authored-by: Sal <ss-o@users.noreply.github.com>
Reconciles promoted changes from main back into next.
@ss-o
ss-o merged commit 5ac7986 into main Aug 16, 2026
9 checks passed
ss-o added a commit that referenced this pull request Aug 16, 2026
chore: reconcile promoted main into next (#184)
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.

1 participant