From ccf555f7cd655a8d61b81a6dc4e1569097dbc641 Mon Sep 17 00:00:00 2001 From: giswqs Date: Fri, 13 Nov 2026 12:45:13 -0500 Subject: [PATCH] ci(fuzz): install nightly by name and bring the fuzz lock file up to date The nightly Fuzz run has failed every night since the toolchain action's pin moved to its stable branch (#1530): the fuzz jobs got stable Rust, and cargo-fuzz's -Zsanitizer flag needs nightly. The job now asks for nightly by name, so the pin can stay where Dependabot keeps it. fuzz/Cargo.lock lacked subsetter and rustc-hash, which rustgis-render has needed since #1828, so the licence job's --locked check refused it. --- .github/workflows/fuzz.yml | 6 +++++- fuzz/Cargo.lock | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/.github/workflows/fuzz.yml b/.github/workflows/fuzz.yml index d84e3b7a8e..38d99892c9 100644 --- a/.github/workflows/fuzz.yml +++ b/.github/workflows/fuzz.yml @@ -64,7 +64,11 @@ jobs: TARGET: ${{ matrix.target }} steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 - - uses: dtolnay/rust-toolchain@b725eda525362e7cf34af9a7243cac1e3f01a7ec # nightly + # The pinned commit is the action's stable branch (Dependabot moves every pin to the same + # one), so nightly is asked for by name: cargo-fuzz's sanitizer flags need it. + - uses: dtolnay/rust-toolchain@b725eda525362e7cf34af9a7243cac1e3f01a7ec # stable + with: + toolchain: nightly - uses: Swatinem/rust-cache@d1527c8f67ef9af357290475d4af4b0fab8f12e0 # v2 with: workspaces: fuzz diff --git a/fuzz/Cargo.lock b/fuzz/Cargo.lock index 0fd77a6ac6..a21d9c902f 100644 --- a/fuzz/Cargo.lock +++ b/fuzz/Cargo.lock @@ -2367,6 +2367,12 @@ dependencies = [ "sqlite-wasm-rs", ] +[[package]] +name = "rustc-hash" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b1e7f9a428571be2dc5bc0505c13fb6bf936822b894ec87abf8a08a4e51742d" + [[package]] name = "rustc_version" version = "0.4.1" @@ -2420,6 +2426,7 @@ dependencies = [ "ruzstd", "serde", "serde_json", + "sha2 0.11.1", "shapefile", "sysinfo", "tempfile", @@ -2524,7 +2531,9 @@ dependencies = [ "rustgis-map", "rustgis-tiles", "serde_json", + "subsetter", "tiny-skia", + "ttf-parser", "unicode-segmentation", "web-time", ] @@ -2974,6 +2983,15 @@ dependencies = [ "unicode-properties", ] +[[package]] +name = "subsetter" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38803281d1c23166c5ebcb455439a5d2afe711cc909cf88af72448c297756ad6" +dependencies = [ + "rustc-hash", +] + [[package]] name = "subtle" version = "2.6.1"