X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=.github%2Fworkflows%2Fbuild.yml;h=c15aeb79d5c01d3569c1c2412e86c74fcc921b7f;hb=7d6be8a5ef72a4ebfe07660cce55f43f6cc30b80;hp=708f570e4d8faf247f5416fe6fdbab19e21ac897;hpb=310ce8982ba7a29e412ef32bb057cb0075d7fbb7;p=ldk-java diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 708f570e..c15aeb79 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,6 +10,8 @@ jobs: container: debian:bullseye env: TOOLCHAIN: stable + strategy: + fail-fast: false steps: - name: Install native Rust toolchain, Valgrind, and build utilitis run: | @@ -33,7 +35,7 @@ jobs: cd .. git clone https://github.com/lightningdevkit/ldk-c-bindings cd ldk-c-bindings - git checkout 0.0.99 + git checkout 0.0.101 - name: Rebuild C bindings without STD for WASM run: | cd ldk-c-bindings @@ -82,13 +84,6 @@ jobs: ./genbindings.sh ./ldk-c-bindings/ "-I/usr/lib/jvm/java-11-openjdk-amd64/include/ -I/usr/lib/jvm/java-11-openjdk-amd64/include/linux/" false false - name: Build deterministic release jar run: ./build-release-jar.sh - - name: Run Java Tests against built release jar - run: | - mvn install:install-file -Dfile=ldk-java.jar -DgroupId=org.ldk -DartifactId=ldk-java -Dversion=1.0-SNAPSHOT -Dpackaging=jar - cd javatester - mvn package - java -ea -jar target/ldk-java-tests-1.0-SNAPSHOT-jar-with-dependencies.jar - cd .. - name: Check latest headers are in git run: | git diff --exit-code @@ -101,8 +96,27 @@ jobs: cp ldk-java-sources.jar "ldk-java-bins/${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/" cp ldk-java.jar "ldk-java-bins/${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/" cp ldk-java-classes.jar "ldk-java-bins/${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/" + cp ldk-java-javadoc.jar "ldk-java-bins/${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/" cd ldk-java-bins - git diff --exit-code + # ldk-java-leaktracking is only for debug purposes and we don't bother with determinism + git checkout "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/ldk-java-leaktracking.jar" + if ! git diff --exit-code; then + mv "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/"* ./ + git checkout "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/" + apt-get -y install diffoscope + diffoscope ldk-java-sources.jar "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/ldk-java-sources.jar" || echo + diffoscope ldk-java-javadoc.jar "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/ldk-java-javadoc.jar" || echo + diffoscope ldk-java-classes.jar "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/ldk-java-classes.jar" || echo + diffoscope ldk-java.jar "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/ldk-java.jar" || echo + exit 1 + fi + - name: Run Java Tests against built release jar + run: | + mvn install:install-file -Dfile=ldk-java.jar -DgroupId=org.lightningdevkit -DartifactId=ldk-java -Dversion=1.0-SNAPSHOT -Dpackaging=jar + cd javatester + mvn package + java -ea -jar target/ldk-java-tests-1.0-SNAPSHOT-jar-with-dependencies.jar + cd .. android: runs-on: ubuntu-latest @@ -110,6 +124,8 @@ jobs: container: debian:bullseye env: TOOLCHAIN: stable + strategy: + fail-fast: false steps: - name: Install rust targets run: | @@ -151,7 +167,7 @@ jobs: cd .. git clone https://github.com/lightningdevkit/ldk-c-bindings cd ldk-c-bindings - git checkout 0.0.99 + git checkout 0.0.101 - name: Detect current git version run: | # We assume the top commit is just a bindings update commit, so we @@ -183,7 +199,13 @@ jobs: rm "ldk-java-bins/${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/LDK-release.aar" cp LDK-release.aar "ldk-java-bins/${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/" cd ldk-java-bins - git diff --exit-code + if ! git diff --exit-code; then + mv "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/LDK-release.aar" ./ + git checkout "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/LDK-release.aar" + apt-get -y install diffoscope + diffoscope LDK-release.aar "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/LDK-release.aar" + exit 1 + fi osx: strategy: @@ -191,6 +213,7 @@ jobs: include: - platform: macos-10.15 - platform: macos-11 + fail-fast: false runs-on: ${{ matrix.platform }} env: TOOLCHAIN: stable @@ -224,7 +247,7 @@ jobs: cd .. git clone https://github.com/lightningdevkit/ldk-c-bindings cd ldk-c-bindings - git checkout 0.0.99 + git checkout 0.0.101 - name: Rebuild C bindings with upstream clang, and check the sample app builds + links run: | cd ldk-c-bindings @@ -290,7 +313,9 @@ jobs: - name: Run Java Tests against built jar run: | mvn -DskipTests=true package - mvn install:install-file -Dfile=target/ldk-java-1.0-SNAPSHOT.jar -DgroupId=org.ldk -DartifactId=ldk-java -Dversion=1.0-SNAPSHOT -Dpackaging=jar + export LDK_GARBAGECOLLECTED_GIT_OVERRIDE="$(cat .git_ver)" + JAR_VERSION=${LDK_GARBAGECOLLECTED_GIT_OVERRIDE:1:100} + mvn install:install-file -Dfile=target/ldk-java-${JAR_VERSION}.jar -DgroupId=org.lightningdevkit -DartifactId=ldk-java -Dversion=1.0-SNAPSHOT -Dpackaging=jar cd javatester mvn package java -ea -jar target/ldk-java-tests-1.0-SNAPSHOT-jar-with-dependencies.jar @@ -312,7 +337,8 @@ jobs: cp "ldk-java-bins/${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/"liblightningjni_MacOSX-{x86_64,aarch64}.nativelib src/main/resources/ mvn clean mvn -DskipTests=true package - mvn install:install-file -Dfile=target/ldk-java-1.0-SNAPSHOT.jar -DgroupId=org.ldk -DartifactId=ldk-java -Dversion=1.0-SNAPSHOT -Dpackaging=jar + JAR_VERSION=${LDK_GARBAGECOLLECTED_GIT_OVERRIDE:1:100} + mvn install:install-file -Dfile=target/ldk-java-${JAR_VERSION}.jar -DgroupId=org.lightningdevkit -DartifactId=ldk-java -Dversion=1.0-SNAPSHOT -Dpackaging=jar cd javatester mvn package java -ea -jar target/ldk-java-tests-1.0-SNAPSHOT-jar-with-dependencies.jar