f moar test

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 917c8b4a1bad3dea712be48c2cd571061ed86b49..c321aaed44b62798e02e4944c228c287cc1bc5fe 100644 (file)
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,7 +15,7 @@ jobs:
         run: |
           apt-get update
           apt-get -y dist-upgrade
-          apt-get -y install cargo libstd-rust-dev-wasm32 valgrind lld git g++ clang openjdk-11-jdk maven
+          apt-get -y install cargo libstd-rust-dev-wasm32 lld git clang
       - name: Checkout source code
         uses: actions/checkout@v2
       - name: Install cbindgen
@@ -33,16 +33,20 @@ jobs:
           cd ..
           git clone https://github.com/lightningdevkit/ldk-c-bindings
           cd ldk-c-bindings
-          sed -i 's|# Now cd to lightning-c-bindings, build the generated bindings, and call cbindgen to build a C header file|export RUSTFLAGS="--remap-path-prefix $LIGHTNING_PATH=rust-lightning --remap-path-prefix $HOME/.cargo= -Z no-parallel-llvm -C codegen-units=1"\nexport RUSTC_BOOTSTRAP=1|' genbindings.sh
+          sed -i 's|lightning = { .*|lightning = { path = "/__w/ldk-garbagecollected/ldk-garbagecollected/rust-lightning/lightning" }|' lightning-c-bindings/Cargo.toml
+          export RUSTFLAGS="--remap-path-prefix $LIGHTNING_PATH=rust-lightning --remap-path-prefix $HOME/.cargo= -Z no-parallel-llvm -C codegen-units=1"
+          export RUSTC_BOOTSTRAP=1
+          export SOURCE_DATE_EPOCH=1616474792
+          cd lightning-c-bindings
+          cargo build -v
+          cargo rustc -v --release -- -C lto
           cat genbindings.sh
-          cd ..
-      - name: Rebuild C bindings, and check the sample app builds + links
-        run: cd ldk-c-bindings && export SOURCE_DATE_EPOCH=1616474792 && ./genbindings.sh ../rust-lightning && cd ..
+          cd ../..
       - name: Upload builds to compare 0
         uses: actions/upload-artifact@v2
         with:
           name: c_bindings
-          path: ldk-c-bindings/lightning-c-bindings/target/release/libldk.a
+          path: ldk-c-bindings/lightning-c-bindings/target/*/lib*
       - name: Build Java/TS Debug Bindings
         run: exit 1 && export SOURCE_DATE_EPOCH=1616474792 && ./genbindings.sh ./ldk-c-bindings/ "-I/usr/lib/jvm/java-11-openjdk-amd64/include/ -I/usr/lib/jvm/java-11-openjdk-amd64/include/linux/" true false
       - name: Run Java Tests against Debug Bindings