Skip to content

fix(deps): correct dependabot config#2306

Merged
nddq merged 1 commit into
mainfrom
fix/dependabot-cooldown-property
May 13, 2026
Merged

fix(deps): correct dependabot config#2306
nddq merged 1 commit into
mainfrom
fix/dependabot-cooldown-property

Conversation

@nddq
Copy link
Copy Markdown
Member

@nddq nddq commented May 11, 2026

Description

Two fixes to .github/dependabot.yaml:

  1. Drop cooldown.semver-major-days from the docker and github-actions blocks. Dependabot rejects the whole config at parse time because semver-major-days is only valid for ecosystems with a real semver model (gomod, npm). default-days stays.

    image
  2. Group docker base image bumps across directories. Add group-by: "dependency-name" to each Docker family group (golang-base, azurelinux-base, windows-base, ubuntu-base) so the same base image bump across /controller, /operator, /cli, /shell, /test/image, and /hack/tools/* lands in a single PR instead of one per Dockerfile. Without it, the family patterns only deduplicate within a single directory job.

Related Issue

N/A.

Checklist

  • I have read the contributing documentation.
  • I signed and signed-off the commits (`git commit -S -s ...`).
  • I have correctly attributed the author(s) of the code.
  • I have tested the changes locally.
  • I have followed the project's style guidelines.
  • I have updated the documentation, if necessary.
  • I have added tests, if applicable.

Screenshots (if applicable) or Testing Completed

N/A — config-only change.

Additional Notes

N/A.

@nddq nddq requested a review from a team as a code owner May 11, 2026 19:43
@nddq nddq requested review from BeegiiK and xiaozhiche320 May 11, 2026 19:43
@nddq nddq added area/infra Test, Release, or CI Infrastructure area/dependencies Pull requests that update a dependency file labels May 11, 2026
@nddq nddq requested review from ibezrukavyi and removed request for BeegiiK and xiaozhiche320 May 11, 2026 19:47
@nddq nddq enabled auto-merge May 11, 2026 19:48
@github-actions
Copy link
Copy Markdown

github-actions Bot commented May 11, 2026

Retina Code Coverage Report

Total coverage no change

@nddq nddq requested a review from SRodi May 12, 2026 14:56
@nddq nddq force-pushed the fix/dependabot-cooldown-property branch from c9096a6 to e39f87c Compare May 13, 2026 15:19
@nddq nddq changed the title fix(deps): drop invalid cooldown.semver-major-days property fix(deps): correct dependabot config May 13, 2026
Copy link
Copy Markdown
Member

@SRodi SRodi left a comment

Choose a reason for hiding this comment

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

LGTM

@nddq nddq added this pull request to the merge queue May 13, 2026
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks May 13, 2026
Drop cooldown.semver-major-days from the docker and github-actions
blocks. Dependabot rejects the whole config at parse time because
semver-major-days is only valid for ecosystems with a real semver
model (gomod, npm).

Add group-by: dependency-name to each Docker family group so the same
base image bump across /controller, /operator, /cli, /shell, /test/image,
and /hack/tools/* lands in a single PR instead of one per Dockerfile.
Without it, the family patterns only deduplicate within a single
directory job.

Signed-off-by: Quang Nguyen <nguyenquang@microsoft.com>
slariviere pushed a commit to slariviere/retina that referenced this pull request May 14, 2026
…ft#2348)

# Description

The `group-by: dependency-name` directive added to all four Docker
family groups in microsoft#2306 turns out to be broken by two open upstream bugs
in `dependabot/dependabot-core`:

- [#14780](dependabot/dependabot-core#14780) —
PRs created with `group-by: dependency-name` can't be rebased; every
`@dependabot rebase` returns "unknown group has been removed from your
config" and the PR is permanently stuck.
- [#14286](dependabot/dependabot-core#14286) —
`group-by: dependency-name` produces one PR per dependency rather than a
single grouped PR, defeating the consolidation goal entirely.

In practice this caused every per-directory Docker bump after microsoft#2306 to
fail with `unknown_error` (seen in run
[25821608265](https://github.com/microsoft/retina/actions/runs/25821608265))
and forced manual closure of ~12 stuck PRs. Drop the directive on all
four Docker groups. The `patterns:` definitions stay, so per-directory
grouping still applies and per-image PRs continue to land as before
microsoft#2306.

## Related Issue

Reverts the `group-by` addition from microsoft#2306. No closing trailer — microsoft#2306's
other change (dropping invalid `cooldown.semver-major-days`) is
preserved.

## Checklist

- [x] I have read the [contributing
documentation](https://retina.sh/docs/Contributing/overview).
- [x] I signed and signed-off the commits (`git commit -S -s ...`).
- [x] I have correctly attributed the author(s) of the code.
- [x] I have tested the changes locally.
- [x] I have followed the project's style guidelines.
- [ ] I have updated the documentation, if necessary.
- [ ] I have added tests, if applicable.

## Screenshots (if applicable) or Testing Completed

N/A — config-only change. Behavior reverts to the pre-microsoft#2306 baseline,
which was already running cleanly.

## Additional Notes

N/A.

Signed-off-by: Quang Nguyen <nguyenquang@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/dependencies Pull requests that update a dependency file area/infra Test, Release, or CI Infrastructure

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants