diff --git a/.github/workflows/fuzz.yml b/.github/workflows/fuzz.yml index 41deb44c..0610aecf 100644 --- a/.github/workflows/fuzz.yml +++ b/.github/workflows/fuzz.yml @@ -16,8 +16,8 @@ jobs: fail-fast: false matrix: fuzz_target: [ -simple_http, minreq_http, +simple_http, ] steps: - name: Install test dependencies @@ -33,12 +33,14 @@ minreq_http, key: cache-${{ matrix.target }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }} - uses: actions-rs/toolchain@v1 with: - toolchain: 1.58 + toolchain: 1.69 override: true profile: minimal - name: fuzz - run: if [[ "${{ matrix.fuzz_target }}" =~ ^bitcoin ]]; then export RUSTFLAGS='--cfg=hashes_fuzz --cfg=secp256k1_fuzz'; fi - run: cd fuzz && ./fuzz.sh "${{ matrix.fuzz_target }}" + run: | + export RUSTFLAGS='--cfg=jsonrpc_fuzz' + echo "Using RUSTFLAGS $RUSTFLAGS" + cd fuzz && ./fuzz.sh "${{ matrix.fuzz_target }}" - run: echo "${{ matrix.fuzz_target }}" >executed_${{ matrix.fuzz_target }} - uses: actions/upload-artifact@v2 with: diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml index e162c065..759926cb 100644 --- a/fuzz/Cargo.toml +++ b/fuzz/Cargo.toml @@ -12,10 +12,10 @@ cargo-fuzz = true honggfuzz = { version = "0.5.55", default-features = false } jsonrpc = { path = "..", features = ["minreq_http"] } -[[bin]] -name = "simple_http" -path = "fuzz_targets/simple_http.rs" - [[bin]] name = "minreq_http" path = "fuzz_targets/minreq_http.rs" + +[[bin]] +name = "simple_http" +path = "fuzz_targets/simple_http.rs" diff --git a/fuzz/generate-files.sh b/fuzz/generate-files.sh index 279002d6..a93b5d05 100755 --- a/fuzz/generate-files.sh +++ b/fuzz/generate-files.sh @@ -70,12 +70,14 @@ $(for name in $(listTargetNames); do echo "$name,"; done) key: cache-\${{ matrix.target }}-\${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }} - uses: actions-rs/toolchain@v1 with: - toolchain: 1.58 + toolchain: 1.69 override: true profile: minimal - name: fuzz - run: if [[ "\${{ matrix.fuzz_target }}" =~ ^bitcoin ]]; then export RUSTFLAGS='--cfg=hashes_fuzz --cfg=secp256k1_fuzz'; fi - run: cd fuzz && ./fuzz.sh "\${{ matrix.fuzz_target }}" + run: | + export RUSTFLAGS='--cfg=jsonrpc_fuzz' + echo "Using RUSTFLAGS \$RUSTFLAGS" + cd fuzz && ./fuzz.sh "\${{ matrix.fuzz_target }}" - run: echo "\${{ matrix.fuzz_target }}" >executed_\${{ matrix.fuzz_target }} - uses: actions/upload-artifact@v2 with: