From 8021034d8611b4837c2bd351aff38ed759e087b0 Mon Sep 17 00:00:00 2001 From: Andrew Poelstra Date: Wed, 22 Mar 2023 02:30:19 +0000 Subject: [PATCH] rename travis-fuzz.sh to fuzz.sh; partially patch CI --- .github/workflows/fuzz.yml | 4 ++-- bitcoin/contrib/test.sh | 10 ---------- fuzz/{travis-fuzz.sh => fuzz.sh} | 0 3 files changed, 2 insertions(+), 12 deletions(-) rename fuzz/{travis-fuzz.sh => fuzz.sh} (100%) diff --git a/.github/workflows/fuzz.yml b/.github/workflows/fuzz.yml index be7e6850..ec0f2902 100644 --- a/.github/workflows/fuzz.yml +++ b/.github/workflows/fuzz.yml @@ -34,7 +34,7 @@ jobs: override: true profile: minimal - name: fuzz - run: cd bitcoin/fuzz && ./travis-fuzz.sh "${{ matrix.fuzz_target }}" + run: cd fuzz && ./fuzz.sh "${{ matrix.fuzz_target }}" - run: echo "${{ matrix.fuzz_target }}.rs" >executed_${{ matrix.fuzz_target }} - uses: actions/upload-artifact@v2 with: @@ -51,5 +51,5 @@ jobs: - name: Display structure of downloaded files run: ls -R - run: find executed_* -type f -exec cat {} + | sort > executed - - run: ls bitcoin/fuzz/fuzz_targets | sort > expected + - run: ls fuzz/fuzz_targets | sort > expected - run: diff expected executed diff --git a/bitcoin/contrib/test.sh b/bitcoin/contrib/test.sh index 07c3b1e1..b5df7169 100755 --- a/bitcoin/contrib/test.sh +++ b/bitcoin/contrib/test.sh @@ -108,16 +108,6 @@ if [ "$DO_DOCS" = true ]; then RUSTDOCFLAGS="-D warnings" cargo +stable doc --all-features fi -# Fuzz if told to -if [ "$DO_FUZZ" = true ] -then - ( - cd fuzz - cargo test --verbose - ./travis-fuzz.sh - ) -fi - # Run formatter if told to. if [ "$DO_FMT" = true ]; then if [ "$NIGHTLY" = false ]; then diff --git a/fuzz/travis-fuzz.sh b/fuzz/fuzz.sh similarity index 100% rename from fuzz/travis-fuzz.sh rename to fuzz/fuzz.sh