Skip to content

Commit 555a5af

Browse files
committed
Revert "On CI, have cargo deny allow RUSTSEC-2025-0021 via gix-testtools"
This reverts commit 67d9bf4, but not the other changes from #1927. `gix-testtools` 0.16.1 has the change in 9b12d50 (#1972) from depending on previous SemVer-incompatible versions of `gix-*` crates to depending on the current versions. Since then, nothing affected by https://rustsec.org/advisories/RUSTSEC-2024-0436.html appears in our dependency tree, and it is no longer necessary or desirable to use a more complicated `cargo deny check advisories` scanning approach allowing that advisory through `gix-testtools`.
1 parent 1b68911 commit 555a5af

File tree

1 file changed

+1
-19
lines changed

1 file changed

+1
-19
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -330,28 +330,10 @@ jobs:
330330

331331
steps:
332332
- uses: actions/checkout@v4
333-
- name: Install tomlq
334-
run: |
335-
# The runner already has the `yq` command but not its associated `tomlq` command.
336-
sudo apt-get update
337-
sudo apt-get install yq
338-
- name: Strict check, but omit gix-testtools
339-
uses: EmbarkStudios/cargo-deny-action@v2
340-
with:
341-
command: check advisories
342-
arguments: --workspace --all-features --exclude gix-testtools
343-
- name: Configure less strict check
344-
run: |
345-
filter='.advisories.ignore += [
346-
{ id: "RUSTSEC-2025-0021", reason: "gix-testtools can’t upgrade from old gix-features yet" }
347-
]'
348-
tomlq "$filter" deny.toml --toml-output > deny-but-ignore-RUSTSEC-2025-0021.toml
349-
- name: Less strict check, but include gix-testtools
350-
uses: EmbarkStudios/cargo-deny-action@v2
333+
- uses: EmbarkStudios/cargo-deny-action@v2
351334
with:
352335
command: check advisories
353336
arguments: --workspace --all-features
354-
command-arguments: --config deny-but-ignore-RUSTSEC-2025-0021.toml
355337

356338
cargo-deny:
357339
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)