X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=.github%2Fworkflows%2Fbuild.yml;h=5bad5ef8b19234f9f956f45882aeb22f23cc5f18;hb=c531c84c4f1bfc4dc42e5edbf2d9be3b370468da;hp=5dec27517c52961584bdd6188d6a2e31f28ada2f;hpb=0b2b27fd29080afa05ee77f6942423a149a4566d;p=ldk-java diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5dec2751..5bad5ef8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,7 +38,7 @@ jobs: cd .. git clone https://github.com/lightningdevkit/ldk-c-bindings cd ldk-c-bindings - git checkout 0.0.105 + git checkout 0.0.106 - name: Rebuild C bindings without STD run: | cd ldk-c-bindings @@ -122,7 +122,7 @@ jobs: cd .. git clone https://github.com/lightningdevkit/ldk-c-bindings cd ldk-c-bindings - git checkout 0.0.105 + git checkout 0.0.106 - name: Rebuild C bindings, and check the sample app builds + links run: | cd ldk-c-bindings @@ -172,7 +172,7 @@ jobs: cd .. git clone https://github.com/lightningdevkit/ldk-c-bindings cd ldk-c-bindings - git checkout 0.0.105 + git checkout 0.0.106 - name: Rebuild C bindings, and check the sample app builds + links run: | cd ldk-c-bindings @@ -192,6 +192,7 @@ jobs: cd ../.. mkdir -p src/main/resources/ cp "ldk-java-bins/${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/liblightningjni_MacOSX-"* src/main/resources/ + rm src/main/resources/liblightningjni_MacOSX-*-leaktracking.nativelib - name: Build Java Release Bindings run: | export LDK_GARBAGECOLLECTED_GIT_OVERRIDE="$(git describe --tag HEAD)" @@ -226,7 +227,6 @@ jobs: cd javatester mvn package java -ea -jar target/ldk-java-tests-1.0-SNAPSHOT-jar-with-dependencies.jar - cd .. android: runs-on: ubuntu-latest @@ -275,7 +275,7 @@ jobs: cd .. git clone https://github.com/lightningdevkit/ldk-c-bindings cd ldk-c-bindings - git checkout 0.0.105 + git checkout 0.0.106 - name: Checkout Android AAR binaries and artifacts run: | # Gitweb only allows snapshots of folders by providing the object hash, which we have to extract: @@ -330,14 +330,14 @@ jobs: run: rustup target install aarch64-apple-darwin - name: Fetch upstream LLVM/clang snapshot run: | - wget -O clang+llvm-13.0.1-x86_64-apple-darwin.tar.xz https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.1/clang+llvm-13.0.1-x86_64-apple-darwin.tar.xz - if [ "$(shasum -a 256 clang+llvm-13.0.1-x86_64-apple-darwin.tar.xz | awk '{ print $1 }')" != "dec02d17698514d0fc7ace8869c38937851c542b02adf102c4e898f027145a4d" ]; then + wget -O clang+llvm-14.0.1-x86_64-apple-darwin.tar.xz https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.1/clang+llvm-14.0.1-x86_64-apple-darwin.tar.xz + if [ "$(shasum -a 256 clang+llvm-14.0.1-x86_64-apple-darwin.tar.xz | awk '{ print $1 }')" != "43149390e95b1cdbf1d4ef2e9d214bbb6d35858ceb2df27245868e06bc4fc44c" ]; then echo "Bad hash" exit 1 fi - name: Unpack upstream LLVM+clang and use it by default run: | - tar xvvf clang+llvm-13.0.1-x86_64-apple-darwin.tar.xz + tar xvvf clang+llvm-14.0.1-x86_64-apple-darwin.tar.xz - name: Checkout source code uses: actions/checkout@v2 with: @@ -355,21 +355,29 @@ jobs: cd .. git clone https://github.com/lightningdevkit/ldk-c-bindings cd ldk-c-bindings - git checkout 0.0.105 + git checkout 0.0.106 - name: Rebuild C bindings with upstream clang, and check the sample app builds + links run: | + export PATH=`pwd`/clang+llvm-14.0.1-x86_64-apple-darwin/bin:$PATH cd ldk-c-bindings - export PATH=`pwd`/clang+llvm-13.0.1-x86_64-apple-darwin/bin:$PATH CC=clang ./genbindings.sh ../rust-lightning true - cd .. - - name: Fetch OpenJDK 16 - run: | - wget -O openjdk-16.0.1_osx-x64_bin.tar.gz https://download.java.net/java/GA/jdk16.0.1/7147401fd7354114ac51ef3e1328291f/9/GPL/openjdk-16.0.1_osx-x64_bin.tar.gz - if [ "$(shasum -a 256 openjdk-16.0.1_osx-x64_bin.tar.gz | awk '{ print $1 }')" != "6098f839954439d4916444757c542c1b8778a32461706812d41cc8bbefce7f2f" ]; then - echo "Bad hash" - exit 1 + - name: Fetch OpenJDK 18 + run: | + if [ "$(uname -m)" = "arm64" ]; then + wget -O openjdk-18.0.1.1_macos-aarch64_bin.tar.gz https://download.java.net/java/GA/jdk18.0.1.1/65ae32619e2f40f3a9af3af1851d6e19/2/GPL/openjdk-18.0.1.1_macos-aarch64_bin.tar.gz + if [ "$(shasum -a 256 openjdk-18.0.1.1_macos-aarch64_bin.tar.gz | awk '{ print $1 }')" != "29773ad68063bdad7fbaeb762cd873d3f243e86de380d3ac5335cdb929371fb5" ]; then + echo "Bad hash" + exit 1 + fi + tar xvvf openjdk-18.0.1.1_macos-aarch64_bin.tar.gz + else + wget -O openjdk-18.0.1.1_macos-x64_bin.tar.gz https://download.java.net/java/GA/jdk18.0.1.1/65ae32619e2f40f3a9af3af1851d6e19/2/GPL/openjdk-18.0.1.1_macos-x64_bin.tar.gz + if [ "$(shasum -a 256 openjdk-18.0.1.1_macos-x64_bin.tar.gz | awk '{ print $1 }')" != "f02d17ec5a387555f8489abc352d973b6c10364409b597046025938e2266d72a" ]; then + echo "Bad hash" + exit 1 + fi + tar xvvf openjdk-18.0.1.1_macos-x64_bin.tar.gz fi - tar xvvf openjdk-16.0.1_osx-x64_bin.tar.gz - name: Checkout latest Linux binaries run: | export LDK_GARBAGECOLLECTED_GIT_OVERRIDE="$(git describe --tag HEAD)" @@ -387,17 +395,20 @@ jobs: - name: Build Java Release Bindings run: | export LDK_GARBAGECOLLECTED_GIT_OVERRIDE="$(git describe --tag HEAD)" - export JAVA_HOME=`pwd`/jdk-16.0.1.jdk/Contents/Home + export JAVA_HOME=`pwd`/jdk-18.0.1.1.jdk/Contents/Home export PATH=$JAVA_HOME/bin:$PATH - export PATH=`pwd`/clang+llvm-13.0.1-x86_64-apple-darwin/bin:$PATH + export PATH=`pwd`/clang+llvm-14.0.1-x86_64-apple-darwin/bin:$PATH ./genbindings.sh ./ldk-c-bindings/ "-I$JAVA_HOME/include/ -I$JAVA_HOME/include/darwin -isysroot$(xcrun --show-sdk-path)" false false + if [ "${{ matrix.platform }}" = "macos-11" ]; then export CC="clang --target=aarch64-apple-darwin" export LDK_TARGET=aarch64-apple-darwin export LDK_TARGET_CPU=apple-a14 ./genbindings.sh ./ldk-c-bindings/ "-I$JAVA_HOME/include/ -I$JAVA_HOME/include/darwin -isysroot$(xcrun --show-sdk-path)" false false cat src/main/resources/liblightningjni_MacOSX-aarch64.nativelib > /dev/null + fi + - name: Fetch Maven 3.8.4 run: | # We don't bother using the upstream mirrors as they remove prior @@ -412,7 +423,7 @@ jobs: export PATH=apache-maven-3.8.4/bin:$PATH - name: Run Java Tests against built jar run: | - export JAVA_HOME=`pwd`/jdk-16.0.1.jdk/Contents/Home + export JAVA_HOME=`pwd`/jdk-18.0.1.1.jdk/Contents/Home export PATH=$JAVA_HOME/bin:$PATH mvn -DskipTests=true package export LDK_GARBAGECOLLECTED_GIT_OVERRIDE="$(git describe --tag HEAD)" @@ -421,7 +432,6 @@ jobs: cd javatester mvn -q -B package java -ea -jar target/ldk-java-tests-1.0-SNAPSHOT-jar-with-dependencies.jar - cd .. - name: Check latest release libs are in git run: | if [ "${{ matrix.platform }}" = "macos-11" ]; then @@ -430,11 +440,23 @@ jobs: diff "ldk-java-bins/${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/"liblightningjni_MacOSX-x86_64.nativelib src/main/resources/liblightningjni_MacOSX-x86_64.nativelib || echo diff "ldk-java-bins/${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/"liblightningjni_MacOSX-aarch64.nativelib src/main/resources/liblightningjni_MacOSX-aarch64.nativelib || echo fi + - name: Upload CI x86_64 build for analysis + if: matrix.platform == 'macos-11' + uses: actions/upload-artifact@v3.0.0 + with: + name: liblightningjni_MacOSX-x86_64.nativelib.ci-build + path: src/main/resources/liblightningjni_MacOSX-x86_64.nativelib + - name: Upload CI aarch64 build for analysis + if: matrix.platform == 'macos-11' + uses: actions/upload-artifact@v3.0.0 + with: + name: liblightningjni_MacOSX-aarch64.nativelib.ci-build + path: src/main/resources/liblightningjni_MacOSX-aarch64.nativelib - name: Run Java Tests against release bins run: | if [ "${{ matrix.platform }}" != "macos-11" ]; then export LDK_GARBAGECOLLECTED_GIT_OVERRIDE="$(git describe --tag HEAD)" - export JAVA_HOME=`pwd`/jdk-16.0.1.jdk/Contents/Home + export JAVA_HOME=`pwd`/jdk-18.0.1.1.jdk/Contents/Home export PATH=$JAVA_HOME/bin:$PATH cp "ldk-java-bins/${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/"liblightningjni_MacOSX-{x86_64,aarch64}.nativelib src/main/resources/ mvn clean @@ -444,5 +466,4 @@ jobs: cd javatester mvn -q -B package java -ea -jar target/ldk-java-tests-1.0-SNAPSHOT-jar-with-dependencies.jar - cd .. fi