Merge pull request #51 from TheBlueMatt/main

[ldk-c-bindings] / .github / workflows / build.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 693f728ee6d5a054228d414189a734c96bd8345c..64bc90c2e78e9c76225726c80eec59cb0068ce6a 100644 (file)
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,11 +25,14 @@ jobs:
         run: |
           # Note that the version tags aren't checked into git
           touch src/version.rs
-          cargo check
+          RUSTFLAGS="--cfg=c_bindings" cargo check
       - name: Install cbindgen
         run: cargo install --force cbindgen
       - name: Checkout Rust-Lightning git
-        run: git clone https://github.com/rust-bitcoin/rust-lightning
+        run: |
+          git clone https://github.com/rust-bitcoin/rust-lightning
+          cd rust-lightning
+          git checkout 0.0.104-bindings
       - name: Rebuild bindings without std, and check the sample app builds + links
         run: ./genbindings.sh ./rust-lightning false
       - name: Rebuild bindings, and check the sample app builds + links
@@ -53,22 +56,14 @@ jobs:
       matrix:
         include:
           - platform: macos-10.15
-          # MacOS 11 is currently in private preview, we've applied for access
-          # - platform: macos-11
+          - platform: macos-11
     runs-on: ${{ matrix.platform }}
     env:
       TOOLCHAIN: stable
     steps:
       - name: Install other Rust platforms
         run: rustup target install aarch64-apple-darwin
-      - name: Cache upstream LLVM/clang
-        id: cache-llvm
-        uses: actions/cache@v2
-        with:
-          path: clang+llvm-12.0.0-x86_64-apple-darwin.tar.xz
-          key: clang+llvm-12.0.0-x86_64-apple-darwin.tar.xz
       - name: Fetch upstream LLVM/clang snapshot
-        if: steps.cache-llvm.outputs.cache-hit != 'true'
         run: |
           wget -O clang+llvm-12.0.0-x86_64-apple-darwin.tar.xz https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.0/clang+llvm-12.0.0-x86_64-apple-darwin.tar.xz
           if [ "$(shasum -a 256 clang+llvm-12.0.0-x86_64-apple-darwin.tar.xz | awk '{ print $1 }')" != "7bc2259bf75c003f644882460fc8e844ddb23b27236fe43a2787870a4cd8ab50" ]; then
@@ -85,7 +80,10 @@ jobs:
       - name: Install cbindgen
         run: cargo install --force cbindgen
       - name: Checkout Rust-Lightning git
-        run: git clone https://github.com/rust-bitcoin/rust-lightning
+        run: |
+          git clone https://github.com/rust-bitcoin/rust-lightning
+          cd rust-lightning
+          git checkout 0.0.104-bindings
       - name: Rebuild bindings using Apple clang, and check the sample app builds + links
         run: ./genbindings.sh ./rust-lightning true
       - name: Rebuild bindings using upstream clang, and check the sample app builds + links