From bd85fc0821432d0a594af6cb887013652a84cc87 Mon Sep 17 00:00:00 2001 From: Mira Ressel Date: Tue, 13 Jun 2023 18:47:14 +0200 Subject: [PATCH] cargo-hfuzz ci: specify manifest patches via cargo --config This is less brittle than locally editing Cargo.toml, which breaks when our devs submit PRs such as #13992 that also temporarily add a patch section. --- scripts/ci/gitlab/pipeline/test.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/scripts/ci/gitlab/pipeline/test.yml b/scripts/ci/gitlab/pipeline/test.yml index f49e36c6a1057..533acd59e094d 100644 --- a/scripts/ci/gitlab/pipeline/test.yml +++ b/scripts/ci/gitlab/pipeline/test.yml @@ -456,6 +456,13 @@ cargo-hfuzz: --exit_code_upon_crash 1 --timeout 10 --run_time 60 + # use git version of honggfuzz-rs until v0.5.56 is out, we need a few recent changes: + # https://github.com/rust-fuzz/honggfuzz-rs/pull/75 to avoid breakage on debian + # https://github.com/rust-fuzz/honggfuzz-rs/pull/81 fix to the above pr + # https://github.com/rust-fuzz/honggfuzz-rs/pull/82 fix for handling rusty-cachier's absolute CARGO_TARGET_DIR + HFUZZ_BUILD_ARGS: > + --config=patch.crates-io.honggfuzz.git="https://github.com/altaua/honggfuzz-rs" + --config=patch.crates-io.honggfuzz.rev="205f7c8c059a0d98fe1cb912cdac84f324cb6981" artifacts: name: "hfuzz-$CI_COMMIT_SHORT_SHA" expire_in: 7 days @@ -463,15 +470,6 @@ cargo-hfuzz: paths: - primitives/arithmetic/fuzzer/hfuzz_workspace/ script: - # use git version of honggfuzz-rs until v0.5.56 is out, we need a few recent changes: - # https://github.com/rust-fuzz/honggfuzz-rs/pull/75 to avoid breakage on debian - # https://github.com/rust-fuzz/honggfuzz-rs/pull/81 fix to the above pr - # https://github.com/rust-fuzz/honggfuzz-rs/pull/82 fix for handling rusty-cachier's absolute CARGO_TARGET_DIR - - | - cat >>Cargo.toml <