Skip to content

Commit 4643c8c

Browse files
def-claude
andcommitted
ci: fix dependabot coverage for cargo-fuzz and console/misc/docker
Two configured directories were not actually covered, in opposite ways. `/test/cargo-fuzz` produced only unmergeable PRs. The fuzz crates reach the root workspace through `path` dependencies, so dependabot resolves that directory to the root `Cargo.toml` and edits it while owning neither the root `Cargo.lock` nor the fuzz manifests. Thirteen such PRs have opened, none merged, and no dependabot commit ever touched `src/*/fuzz/Cargo.toml`. Drop it, and say why in a comment. `check_fuzz_versions_mirror_root` in `bin/lint-cargo` still enforces the pins, tripping only on a semver-incompatible root bump. `/console/misc/docker` was added as a second `directory:` key in an existing entry, and YAML keeps only the last, so it resolved to `/misc/images/materialized-base`. Collapse the eight byte-identical docker entries into one `directories:` list rather than add a ninth. Dependabot can now group updates across docker directories into one PR. Pin that Dockerfile's builder by multi-arch index digest, matching the nginx base in the same file, so the new coverage has something stable to refresh. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
1 parent 1753de8 commit 4643c8c

2 files changed

Lines changed: 21 additions & 109 deletions

File tree

.github/dependabot.yml

Lines changed: 18 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
11
version: 2
22
updates:
3+
# `/test/cargo-fuzz` is deliberately absent. The fuzz crates reach the root
4+
# workspace through `path` dependencies, so dependabot resolves that directory to
5+
# the root `Cargo.toml` and proposes edits to it while owning neither the root
6+
# `Cargo.lock` nor the fuzz manifests. Every such PR fails `--locked` and
7+
# duplicates the `/` PR for the same crate. Keeping the fuzz pins equal to the
8+
# root is enforced by `check_fuzz_versions_mirror_root` in `bin/lint-cargo`
9+
# instead, so a semver-incompatible root bump has to update the affected
10+
# `src/*/fuzz/Cargo.toml` by hand in the same PR.
311
- package-ecosystem: cargo
412
directories:
513
- /
6-
- /test/cargo-fuzz
714
schedule:
815
interval: weekly
916
day: sunday
@@ -82,113 +89,16 @@ updates:
8289
- minor
8390
- patch
8491
- package-ecosystem: docker
85-
directory: /console
86-
schedule:
87-
interval: weekly
88-
day: sunday
89-
time: "22:00"
90-
# TODO: Add cooldown when https://github.com/dependabot/dependabot-core/issues/14044 is fixed
91-
open-pull-requests-limit: 50
92-
labels: [A-dependencies]
93-
groups:
94-
simple:
95-
applies-to: version-updates
96-
update-types:
97-
- minor
98-
- patch
99-
- package-ecosystem: docker
100-
directory: /console/misc/docker
101-
directory: /misc/images/materialized-base
102-
schedule:
103-
interval: weekly
104-
day: sunday
105-
time: "22:00"
106-
# TODO: Add cooldown when https://github.com/dependabot/dependabot-core/issues/14044 is fixed
107-
open-pull-requests-limit: 50
108-
labels: [A-dependencies]
109-
groups:
110-
simple:
111-
applies-to: version-updates
112-
update-types:
113-
- minor
114-
- patch
115-
- package-ecosystem: docker
116-
directory: /misc/images/debian-base
117-
schedule:
118-
interval: weekly
119-
day: sunday
120-
time: "22:00"
121-
# TODO: Add cooldown when https://github.com/dependabot/dependabot-core/issues/14044 is fixed
122-
open-pull-requests-limit: 50
123-
labels: [A-dependencies]
124-
groups:
125-
simple:
126-
applies-to: version-updates
127-
update-types:
128-
- minor
129-
- patch
130-
- package-ecosystem: docker
131-
directory: /misc/images/openssh-static
132-
schedule:
133-
interval: weekly
134-
day: sunday
135-
time: "22:00"
136-
# TODO: Add cooldown when https://github.com/dependabot/dependabot-core/issues/14044 is fixed
137-
open-pull-requests-limit: 50
138-
labels: [A-dependencies]
139-
groups:
140-
simple:
141-
applies-to: version-updates
142-
update-types:
143-
- minor
144-
- patch
145-
- package-ecosystem: docker
146-
directory: /misc/images/tini-static
147-
schedule:
148-
interval: weekly
149-
day: sunday
150-
time: "22:00"
151-
# TODO: Add cooldown when https://github.com/dependabot/dependabot-core/issues/14044 is fixed
152-
open-pull-requests-limit: 50
153-
labels: [A-dependencies]
154-
groups:
155-
simple:
156-
applies-to: version-updates
157-
update-types:
158-
- minor
159-
- patch
160-
- package-ecosystem: docker
161-
directory: /misc/images/distroless-prod-base
162-
schedule:
163-
interval: weekly
164-
day: sunday
165-
time: "22:00"
166-
# TODO: Add cooldown when https://github.com/dependabot/dependabot-core/issues/14044 is fixed
167-
open-pull-requests-limit: 50
168-
labels: [A-dependencies]
169-
groups:
170-
simple:
171-
applies-to: version-updates
172-
update-types:
173-
- minor
174-
- patch
175-
- package-ecosystem: docker
176-
directory: /ci/builder
177-
schedule:
178-
interval: weekly
179-
day: sunday
180-
time: "22:00"
181-
# TODO: Add cooldown when https://github.com/dependabot/dependabot-core/issues/14044 is fixed
182-
open-pull-requests-limit: 50
183-
labels: [A-dependencies]
184-
groups:
185-
simple:
186-
applies-to: version-updates
187-
update-types:
188-
- minor
189-
- patch
190-
- package-ecosystem: docker
191-
directory: /test
92+
directories:
93+
- /console
94+
- /console/misc/docker
95+
- /misc/images/materialized-base
96+
- /misc/images/debian-base
97+
- /misc/images/openssh-static
98+
- /misc/images/tini-static
99+
- /misc/images/distroless-prod-base
100+
- /ci/builder
101+
- /test
192102
schedule:
193103
interval: weekly
194104
day: sunday

console/misc/docker/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
# the Business Source License, use of this software will be governed
88
# by the Apache License, Version 2.0.
99

10-
FROM node:20-alpine AS builder
10+
# Pinned by rolling tag + multi-arch index digest so dependabot refreshes the
11+
# digest for security fixes.
12+
FROM node:20-alpine@sha256:fb4cd12c85ee03686f6af5362a0b0d56d50c58a04632e6c0fb8363f609372293 AS builder
1113

1214
WORKDIR /app
1315

0 commit comments

Comments
 (0)