Skip to content

ci(deps): point Dependabot version updates at staging - #78

Merged
maehr merged 1 commit into
textrefs:stagingfrom
maehr:ci/dependabot-staging
Aug 12, 2026
Merged

ci(deps): point Dependabot version updates at staging#78
maehr merged 1 commit into
textrefs:stagingfrom
maehr:ci/dependabot-staging

Conversation

@maehr

@maehr maehr commented Aug 12, 2026

Copy link
Copy Markdown
Member

Fixes the root cause behind #68 §7 — ten dependabot PRs piled up against main, a branch that cannot keep them.

The problem

main only moves at release time, by squash-merging staging. A bump merged into main alone is reverted by the next release: the squash applies staging's tree against a merge base that predates the bump, so the older versions win. Anything meant to survive a release has to arrive through staging.

What changes

Caveat, documented in the file

target-branch governs version updates only. Dependabot security updates are always raised against the default branch and ignore it, so advisory-driven PRs will keep appearing against main and still need folding into staging by hand. That is a GitHub constraint, not a configuration choice.

Follow-up

The ten open npm PRs are superseded by #73 and should be closed rather than merged; #32 is closed by #77, which landed the same setup-node bump on staging.

Part of #68.

`main` only moves at release time, by squash-merging `staging`. A bump
that lands on `main` alone is reverted by the next release, because the
squash applies staging's tree against a merge base that predates it —
which is how ten dependabot PRs accumulated against a branch that could
not keep them.

Also adds the npm ecosystem, which had no entry at all: every npm PR in
the queue arrived as a security update rather than a version update, so
ordinary dependency drift was only ever caught by an advisory. Astro,
Starlight and their plugins are grouped, since they resolve together.

Security updates still target the default branch — `target-branch` does
not apply to them — so advisory PRs will keep appearing against `main`.
Copilot AI lite review requested due to automatic review settings August 12, 2026 21:38

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Updates the repository’s Dependabot configuration so routine dependency version bumps land on staging (the branch that actually flows into main at release time), preventing version-update PRs from being effectively reverted by the next staging → main squash release process.

Changes:

  • Retarget Dependabot GitHub Actions version updates to staging.
  • Add a new npm Dependabot entry targeting staging, with grouping to keep Astro/Starlight-related upgrades together and everything else in a catch-all group.
  • Document the target-branch caveat that security updates will still target the default branch (main) due to GitHub constraints.

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

@maehr
maehr merged commit 37faf37 into textrefs:staging Aug 12, 2026
2 checks passed
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.

2 participants