Merge pull request #133 from keyuebao/keyue/issue-132

[ldk-java] / .github / workflows / build.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1e90cd6e64d393e7639ee15e0180571d94efa975..6ce9785a61d15b3101a14e3f433037943cc59ee9 100644 (file)
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -40,11 +40,11 @@ jobs:
           # Note this is a different endpoint, as we need one non-upstream commit!
           git clone https://git.bitcoin.ninja/rust-lightning
           cd rust-lightning
-          git checkout origin/2023-02-0.0.114-java-bindings
+          git checkout origin/2023-04-0.0.115-java-bindings
           cd ..
           git clone https://github.com/lightningdevkit/ldk-c-bindings
           cd ldk-c-bindings
-          git checkout 0.0.114
+          git checkout 0.0.115
       - name: Rebuild C bindings without STD
         run: |
           cd ldk-c-bindings
@@ -134,11 +134,11 @@ jobs:
           # Note this is a different endpoint, as we need one non-upstream commit!
           git clone https://git.bitcoin.ninja/rust-lightning
           cd rust-lightning
-          git checkout origin/2023-02-0.0.114-java-bindings
+          git checkout origin/2023-04-0.0.115-java-bindings
           cd ..
           git clone https://github.com/lightningdevkit/ldk-c-bindings
           cd ldk-c-bindings
-          git checkout 0.0.114
+          git checkout 0.0.115
       - name: Rebuild C bindings, and check the sample app builds + links
         run: |
           cd ldk-c-bindings
@@ -190,11 +190,11 @@ jobs:
           # Note this is a different endpoint, as we need one non-upstream commit!
           git clone https://git.bitcoin.ninja/rust-lightning
           cd rust-lightning
-          git checkout origin/2023-02-0.0.114-java-bindings
+          git checkout origin/2023-04-0.0.115-java-bindings
           cd ..
           git clone https://github.com/lightningdevkit/ldk-c-bindings
           cd ldk-c-bindings
-          git checkout 0.0.114
+          git checkout 0.0.115
       - name: Rebuild C bindings, and check the sample app builds + links
         run: |
           cd ldk-c-bindings
@@ -266,6 +266,9 @@ jobs:
           chmod +x ./rustup.sh
           ./rustup.sh -y
           . $HOME/.cargo/env
+          # Temporarily use 1.67.1 to fix https://github.com/rust-lang/rust/issues/108943
+          rustup install 1.67.1
+          rustup default 1.67.1
           rustup target add armv7-linux-androideabi
           rustup target add aarch64-linux-android
           rustup target add i686-linux-android
@@ -294,11 +297,11 @@ jobs:
           # Note this is a different endpoint, as we need one non-upstream commit!
           git clone https://git.bitcoin.ninja/rust-lightning
           cd rust-lightning
-          git checkout origin/2023-02-0.0.114-java-bindings
+          git checkout origin/2023-04-0.0.115-java-bindings
           cd ..
           git clone https://github.com/lightningdevkit/ldk-c-bindings
           cd ldk-c-bindings
-          git checkout 0.0.114
+          git checkout 0.0.115
       - name: Checkout Android AAR binaries and artifacts
         run: |
           # Gitweb only allows snapshots of folders by providing the object hash, which we have to extract:
@@ -375,11 +378,11 @@ jobs:
           # Note this is a different endpoint, as we need one non-upstream commit!
           git clone https://git.bitcoin.ninja/rust-lightning
           cd rust-lightning
-          git checkout origin/2023-02-0.0.114-java-bindings
+          git checkout origin/2023-04-0.0.115-java-bindings
           cd ..
           git clone https://github.com/lightningdevkit/ldk-c-bindings
           cd ldk-c-bindings
-          git checkout 0.0.114
+          git checkout 0.0.115
       - name: Rebuild C bindings with upstream clang, and check the sample app builds + links
         run: |
           export PATH=`pwd`/clang+llvm-15.0.7-x86_64-apple-darwin21.0/bin:$PATH