X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=.github%2Fworkflows%2Fbuild.yml;h=a379d1cd64ba73c4c07c57336f698ce245214724;hb=5e8b6833339a67f2f9a498db74b43ef93629755c;hp=e4fe497fa3b6d3d8307d6392f6c2847751bdd6d2;hpb=1c8401490f7950e7c6649a8ebd45414960337251;p=rust-lightning

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e4fe497f..a379d1cd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -153,11 +153,14 @@ jobs:
             echo "Bad hash"
             exit 1
           fi
-      - name: Run benchmarks on Rust ${{ matrix.toolchain }}
+      - name: Test with Network Graph on Rust ${{ matrix.toolchain }}
         run: |
           cd lightning
-          cargo bench --features unstable
+          RUSTFLAGS="--cfg=require_route_graph_test" cargo test
           cd ..
+      - name: Run benchmarks on Rust ${{ matrix.toolchain }}
+        run: |
+          cargo bench --features unstable
 
   check_commits:
     runs-on: ubuntu-latest
@@ -202,49 +205,11 @@ jobs:
           sudo apt-get update
           sudo apt-get -y install build-essential binutils-dev libunwind-dev
       - name: Sanity check fuzz targets on Rust ${{ env.TOOLCHAIN }}
-        run: cd fuzz && cargo test --verbose --color always
+        run: cd fuzz && RUSTFLAGS="--cfg=fuzzing" cargo test --verbose --color always
       - name: Run fuzzers
-        run: cd fuzz && ./ci-fuzz.sh
-
-  check_bindings:
-    runs-on: ubuntu-latest
-    # Ubuntu's version of rustc uses its own LLVM instead of being a real native package.
-    # This leaves us with an incompatible LLVM version when linking. Instead, use a real OS.
-    # We further (temporarily) use Debian experimental since testing links rustc against the
-    # brand-new llvm-10, but clang/llvm still default to LLVM 9.
-    container: debian:experimental
-    env:
-      TOOLCHAIN: stable
-    steps:
-      - name: Install native Rust toolchain, Valgrind, and build utilitis
-        run: |
-          echo 'Package: llvm llvm-runtime clang lld' > /etc/apt/preferences.d/99-llvm10
-          echo 'Pin: release n=experimental' >> /etc/apt/preferences.d/99-llvm10
-          echo 'Pin-Priority: 995' >> /etc/apt/preferences.d/99-llvm10
-          apt-get update
-          apt-get -y dist-upgrade
-          apt-get -y install cargo valgrind lld git g++ clang
-      - name: Checkout source code
-        uses: actions/checkout@v2
-      - name: Sanity test bindings
-        working-directory: lightning-c-bindings
-        run: cargo check
-      - name: Install cbindgen
-        run: cargo install --force cbindgen
-      - name: Rebuild bindings, and check the sample app builds + links
-        run: ./genbindings.sh
-      - name: Check that the latest bindings are in git
-        run: |
-          if [ "$(git diff)" != "" ]; then
-            # cbindgen's bindings output order can be FS-dependant, so check that the lines are all the same:
-            mv lightning-c-bindings/include/lightning.h lightning-c-bindings/include/lightning.h.new
-            git checkout lightning-c-bindings/include/lightning.h
-            cat lightning-c-bindings/include/lightning.h | grep -v "Generated with cbindgen:[0-9\.]*" | sort > lightning-c-bindings/include/lightning.h.sorted
-            cat lightning-c-bindings/include/lightning.h.new | grep -v "Generated with cbindgen:[0-9\.]*" | sort > lightning-c-bindings/include/lightning.h.new.sorted
-            diff lightning-c-bindings/include/lightning.h.sorted lightning-c-bindings/include/lightning.h.new.sorted
-            [ "$(diff lightning-c-bindings/include/lightning.h.sorted lightning-c-bindings/include/lightning.h.new.sorted)" != "" ] && exit 2
-            git diff --exit-code
-          fi
+        run: cd fuzz && ./ci-fuzz.sh && cd ..
+      - name: Run lightning-invoice fuzzers
+        run: cd lightning-invoice/fuzz && RUSTFLAGS="--cfg=fuzzing" cargo test --verbose && ./ci-fuzz.sh
 
   linting:
     runs-on: ubuntu-latest