X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=.github%2Fworkflows%2Fbuild.yml;h=1c90f63ae1aa5e651451a4bfb3856dd2955cd466;hb=3beda67d431be21b9c69152810c98239794e3247;hp=1d1b9b57583e29b5126aadf03285e0607004be2b;hpb=c5c48419f103037867bf86a98edc8f3a41b24ce1;p=ldk-c-bindings

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1d1b9b5..1c90f63 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,18 +4,27 @@ on: [push, pull_request]
 
 jobs:
   check_bindings:
+    strategy:
+      fail-fast: false
+      matrix:
+        # 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.
+        distro: [ "debian:bullseye", "fedora:39" ]
     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.
-    container: debian:bullseye
+    container: ${{ matrix.distro }}
     env:
       TOOLCHAIN: stable
     steps:
       - name: Install native Rust toolchain, Valgrind, and build utilitis
+        if: "matrix.distro == 'debian:bullseye'"
         run: |
           apt-get update
           apt-get -y dist-upgrade
           apt-get -y install cargo libstd-rust-dev-wasm32 valgrind lld git g++ clang wget
+      - name: Install native Rust toolchain, Valgrind, and build utilitis
+        if: "matrix.distro == 'fedora:39'"
+        run: |
+          dnf -y install cargo rust-std-static-wasm32-wasi valgrind lld git g++ clang wget which diffutils
       - name: Checkout source code
         uses: actions/checkout@v2
         with:
@@ -37,9 +46,22 @@ jobs:
         run: |
           git clone https://github.com/rust-bitcoin/rust-lightning
           cd rust-lightning
-          git checkout 0.0.115-bindings
+          git checkout 0.0.121-bindings
+      - name: Pin memchr
+        if: "matrix.distro == 'debian:bullseye'"
+        run: |
+          # Pin memchr until we can remove it
+          cd rust-lightning
+          cargo update -p memchr --precise "2.5.0" --verbose
       - name: Fix Github Actions to not be broken
         run: git config --global --add safe.directory /__w/ldk-c-bindings/ldk-c-bindings
+      - name: Pin proc-macro, quote and memchr to meet MSRV
+        run: |
+          cd c-bindings-gen
+          cargo update -p quote --precise "1.0.30" --verbose
+          cargo update -p proc-macro2 --precise "1.0.65" --verbose
+          cd ../lightning-c-bindings
+          cargo update -p memchr --precise "2.5.0" --verbose
       - 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
@@ -92,7 +114,7 @@ jobs:
         run: |
           git clone https://github.com/rust-bitcoin/rust-lightning
           cd rust-lightning
-          git checkout 0.0.115-bindings
+          git checkout 0.0.121-bindings
       - name: Fix Github Actions to not be broken
         run: git config --global --add safe.directory /__w/ldk-c-bindings/ldk-c-bindings
       - name: Fetch MacOS SDK
@@ -139,7 +161,7 @@ jobs:
         run: |
           git clone https://github.com/rust-bitcoin/rust-lightning
           cd rust-lightning
-          git checkout 0.0.115-bindings
+          git checkout 0.0.121-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