From 25893ed99b527475c89690793843f9fcd4ce8bd1 Mon Sep 17 00:00:00 2001 From: Eliah Kagan Date: Fri, 23 Aug 2024 19:24:00 -0400 Subject: [PATCH 1/3] Revert "Looks like fuzzing is failing permanently again" This reverts commit 3d90ab05959f34803e26cffda6ac33993fb183fe. --- .github/workflows/cifuzz.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .github/workflows/cifuzz.yml diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml new file mode 100644 index 00000000000..8d47de8f003 --- /dev/null +++ b/.github/workflows/cifuzz.yml @@ -0,0 +1,27 @@ +name: CIFuzz +on: + pull_request: + branches: [ main ] + workflow_dispatch: +jobs: + Fuzzing: + runs-on: ubuntu-latest + steps: + - name: Build Fuzzers + id: build + uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master + with: + oss-fuzz-project-name: 'gitoxide' + language: rust + - name: Run Fuzzers + uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master + with: + oss-fuzz-project-name: 'gitoxide' + language: rust + fuzz-seconds: 600 + - name: Upload Crash + uses: actions/upload-artifact@v4 + if: failure() && steps.build.outcome == 'success' + with: + name: artifacts + path: ./out/artifacts From aafa8b14ad901518bf5bb7dcbb2385a172746696 Mon Sep 17 00:00:00 2001 From: Eliah Kagan Date: Sun, 15 Sep 2024 02:09:53 -0400 Subject: [PATCH 2/3] Try manully specifying old serde{,_derive,_json} in `Cargo.toml` As before #1536. I'm not sure CI fuzzing actually uses locked dependencies, though. --- Cargo.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ad92273b749..99e32d06ebb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4312,18 +4312,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.208" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.208" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", @@ -4332,9 +4332,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.125" +version = "1.0.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed" +checksum = "4ab380d7d9f22ef3f21ad3e6c1ebe8e4fc7a2000ccba2e4d71fc96f15b2cb609" dependencies = [ "itoa", "memchr", From 39cab610d8e5eb7b39f239296deef43157c5b72c Mon Sep 17 00:00:00 2001 From: Eliah Kagan Date: Tue, 17 Sep 2024 22:52:16 -0400 Subject: [PATCH 3/3] Revert "Try manully specifying old serde{,_derive,_json} in `Cargo.toml`" This reverts commit aafa8b14ad901518bf5bb7dcbb2385a172746696, since fuzzing doesn't use locked dependencies, so that's not a fix. See: - https://github.com/Byron/gitoxide/pull/1596#issuecomment-2351412038 - https://github.com/google/oss-fuzz/pull/12512, which does fix it --- Cargo.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 99e32d06ebb..ad92273b749 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4312,18 +4312,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.204" +version = "1.0.208" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" +checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.204" +version = "1.0.208" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" +checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf" dependencies = [ "proc-macro2", "quote", @@ -4332,9 +4332,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.121" +version = "1.0.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ab380d7d9f22ef3f21ad3e6c1ebe8e4fc7a2000ccba2e4d71fc96f15b2cb609" +checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed" dependencies = [ "itoa", "memchr",