X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=.github%2Fworkflows%2Fbuild.yml;h=6ce2ef61808ea68f682fff6a1c94f83aebd7d6cd;hb=0d5f55c8e63442f3f6ea379b390847123ac92a3d;hp=c470471e0b98109aaf804d867c062cdcd1fc8a1c;hpb=0061ee2bb89ec994aeefd1e540558ce975067c7b;p=ldk-java diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c470471e..6ce2ef61 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,12 +10,14 @@ jobs: container: debian:bullseye env: TOOLCHAIN: stable + strategy: + fail-fast: false steps: - name: Install native Rust toolchain, Valgrind, and build utilitis run: | apt-get update apt-get -y dist-upgrade - apt-get -y install cargo libstd-rust-dev-wasm32 valgrind lld git g++ clang openjdk-11-jdk maven + apt-get -y install cargo libstd-rust-dev-wasm32 valgrind lld git g++ clang openjdk-11-jdk maven faketime zip unzip llvm - name: Checkout source code uses: actions/checkout@v2 with: @@ -26,13 +28,14 @@ jobs: run: | git config --global user.email "ldk-ci@example.com" git config --global user.name "LDK CI" - git clone https://github.com/rust-bitcoin/rust-lightning + # 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 remote add matt https://git.bitcoin.ninja/rust-lightning - git fetch matt - git merge matt/2021-03-java-bindings-base + git checkout origin/2021-03-java-bindings-base cd .. git clone https://github.com/lightningdevkit/ldk-c-bindings + cd ldk-c-bindings + git checkout 0.0.100 - name: Rebuild C bindings without STD for WASM run: | cd ldk-c-bindings @@ -54,7 +57,7 @@ jobs: mv liblightningjni_debug_Linux-amd64.so liblightningjni.so export ASAN_OPTIONS=detect_leaks=0 LD_PRELOAD=/usr/lib/llvm-11/lib/clang/11.0.1/lib/linux/libclang_rt.asan-x86_64.so LD_LIBRARY_PATH=. mvn test - - name: Build Java/TS Release Bindings + - name: Detect current git version run: | # We assume the top commit is just a bindings update commit, so we # check out the previous commit to use as the commit we git describe. @@ -68,26 +71,147 @@ jobs: export LDK_GARBAGECOLLECTED_GIT_OVERRIDE="$(git describe --tag $MERGE_HEAD^1)" fi echo "Using $LDK_GARBAGECOLLECTED_GIT_OVERRIDE as git version" + echo "$LDK_GARBAGECOLLECTED_GIT_OVERRIDE" > .git_ver + - name: Checkout latest MacOS binaries + run: | + export LDK_GARBAGECOLLECTED_GIT_OVERRIDE="$(cat .git_ver)" + git clone --depth 1 https://git.bitcoin.ninja/ldk-java-bins + mkdir -p src/main/resources/ + cp "ldk-java-bins/${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/liblightningjni_MacOSX-"* src/main/resources/ + - name: Build Java/TS Release Bindings + run: | + export LDK_GARBAGECOLLECTED_GIT_OVERRIDE="$(cat .git_ver)" ./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: Check latest headers and release lib are in git + - name: Build deterministic release jar + run: ./build-release-jar.sh + - name: Check latest headers are in git run: | git diff --exit-code + - name: Check latest library and jars are in bins repo + run: | + export LDK_GARBAGECOLLECTED_GIT_OVERRIDE="$(cat .git_ver)" + rm "ldk-java-bins/${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/"*.jar + rm "ldk-java-bins/${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/"liblightningjni_Linux*.nativelib + cp src/main/resources/liblightningjni_Linux-amd64.nativelib "ldk-java-bins/${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/" + 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 + 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" + diffoscope ldk-java-javadoc.jar "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/ldk-java-javadoc.jar" + diffoscope ldk-java-classes.jar "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/ldk-java-classes.jar" + diffoscope ldk-java.jar "${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/ldk-java.jar" + exit 1 + fi - name: Run Java Tests against built release 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 + 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 + # Frankly, I'm not really sure why debian and ubuntu differ in the results here, they really shouldn't + container: debian:bullseye + env: + TOOLCHAIN: stable + strategy: + fail-fast: false + steps: + - name: Install rust targets + run: | + apt-get update + apt-get -y dist-upgrade + apt-get -y install git g++ clang faketime zip unzip curl openjdk-11-jdk + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > rustup.sh + chmod +x ./rustup.sh + ./rustup.sh -y + . $HOME/.cargo/env + rustup target add armv7-linux-androideabi + rustup target add aarch64-linux-android + rustup target add i686-linux-android + rustup target add x86_64-linux-android + - name: Checkout source code + uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Install android NDK compilers + run: | + curl https://dl.google.com/android/repository/android-ndk-r22b-linux-x86_64.zip > android-ndk-r22b-linux-x86_64.zip + if [ "$(sha256sum android-ndk-r22b-linux-x86_64.zip | awk '{ print $1 }')" != "ac3a0421e76f71dd330d0cd55f9d99b9ac864c4c034fc67e0d671d022d4e806b" ]; then + echo "Bad hash" + exit 1 + fi + unzip android-ndk-r22b-linux-x86_64.zip + - name: Install cbindgen + run: | + . $HOME/.cargo/env + cargo install --force cbindgen + - name: Checkout Rust-Lightning and LDK-C-Bindings git + run: | + git config --global user.email "ldk-ci@example.com" + git config --global user.name "LDK CI" + # 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/2021-03-java-bindings-base + cd .. + git clone https://github.com/lightningdevkit/ldk-c-bindings + cd ldk-c-bindings + git checkout 0.0.100 + - name: Detect current git version + run: | + # We assume the top commit is just a bindings update commit, so we + # check out the previous commit to use as the commit we git describe. + # If the top commit is a merge commit, we need to get the last merge + # head and assume the latest bindings are built against its parent. + COMMIT_PARENTS=$(git show -s --pretty=format:%P HEAD) + if [ "${#COMMIT_PARENTS}" = 40 ]; then + export LDK_GARBAGECOLLECTED_GIT_OVERRIDE="$(git describe --tag HEAD^1)" + else + MERGE_HEAD=$(git show --pretty=format:%P HEAD | ( for last in $(cat /dev/stdin); do true; done; echo $last )) + export LDK_GARBAGECOLLECTED_GIT_OVERRIDE="$(git describe --tag $MERGE_HEAD^1)" + fi + echo "Using $LDK_GARBAGECOLLECTED_GIT_OVERRIDE as git version" + echo "$LDK_GARBAGECOLLECTED_GIT_OVERRIDE" > .git_ver + - name: Checkout Android AAR binaries and artifacts + run: git clone --depth 1 https://git.bitcoin.ninja/ldk-java-bins + - name: Build Android aar + run: | + . $HOME/.cargo/env + export LDK_GARBAGECOLLECTED_GIT_OVERRIDE="$(cat .git_ver)" + cp "ldk-java-bins/${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/ldk-java-classes.jar" ./ + export ANDROID_TOOLCHAIN="$(pwd)/android-ndk-r22b/toolchains/llvm/prebuilt/linux-x86_64" + export PATH="$PATH:$ANDROID_TOOLCHAIN/bin" + ./android-build.sh ./rust-lightning ./ldk-c-bindings/ ./ldk-java-bins/android-artifacts + - name: Check latest library and jars are in bins repo + run: | + export LDK_GARBAGECOLLECTED_GIT_OVERRIDE="$(cat .git_ver)" + 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 + 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: matrix: include: - platform: macos-10.15 - # MacOS 11 is currently in private preview, we've applied for access - # - platform: macos-11 + - platform: macos-11 + fail-fast: false runs-on: ${{ matrix.platform }} env: TOOLCHAIN: stable @@ -114,13 +238,14 @@ jobs: run: | git config --global user.email "ldk-ci@example.com" git config --global user.name "LDK CI" - git clone https://github.com/rust-bitcoin/rust-lightning + # 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 remote add matt https://git.bitcoin.ninja/rust-lightning - git fetch matt - git merge matt/2021-03-java-bindings-base + git checkout origin/2021-03-java-bindings-base cd .. git clone https://github.com/lightningdevkit/ldk-c-bindings + cd ldk-c-bindings + git checkout 0.0.100 - name: Rebuild C bindings with upstream clang, and check the sample app builds + links run: | cd ldk-c-bindings @@ -137,7 +262,7 @@ jobs: tar xvvf openjdk-16.0.1_osx-x64_bin.tar.gz export JAVA_HOME=`pwd`/jdk-16.0.1.jdk/Contents/Home export PATH=$JAVA_HOME/bin:$PATH - - name: Build Java/TS Release Bindings + - name: Detect current git version run: | # We assume the top commit is just a bindings update commit, so we # check out the previous commit to use as the commit we git describe. @@ -151,12 +276,29 @@ jobs: export LDK_GARBAGECOLLECTED_GIT_OVERRIDE="$(git describe --tag $MERGE_HEAD^1)" fi echo "Using $LDK_GARBAGECOLLECTED_GIT_OVERRIDE as git version" + echo "$LDK_GARBAGECOLLECTED_GIT_OVERRIDE" > .git_ver + - name: Checkout latest Linux binaries + run: | + export LDK_GARBAGECOLLECTED_GIT_OVERRIDE="$(cat .git_ver)" + git clone --depth 1 https://git.bitcoin.ninja/ldk-java-bins + mkdir -p src/main/resources/ + cp "ldk-java-bins/${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/liblightningjni_Linux-"* src/main/resources/ + - name: Build Java/TS Release Bindings + run: | + export LDK_GARBAGECOLLECTED_GIT_OVERRIDE="$(cat .git_ver)" # genbindings.sh always fails as there is no wasm32-wasi library - # available, so instead we delete the expected JNI library and check - # that it was created. - rm src/main/resources/liblightningjni_MacOSX-x86_64.nativelib + # available, so instead we check that the expected JNI library + # is created. + export PATH=`pwd`/clang+llvm-12.0.0-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 || echo cat src/main/resources/liblightningjni_MacOSX-x86_64.nativelib > /dev/null + 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 || echo + cat src/main/resources/liblightningjni_MacOSX-aarch64.nativelib > /dev/null + fi - name: Fetch Maven 3.8.1 run: | wget -O apache-maven-3.8.1-bin.tar.gz https://apache.osuosl.org/maven/maven-3/3.8.1/binaries/apache-maven-3.8.1-bin.tar.gz @@ -169,13 +311,34 @@ 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 cd .. - - name: Check latest headers and release lib are in git + - name: Check latest release libs are in git run: | if [ "${{ matrix.platform }}" = "macos-11" ]; then - git diff --exit-code + export LDK_GARBAGECOLLECTED_GIT_OVERRIDE="$(cat .git_ver)" + rm "ldk-java-bins/${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/"liblightningjni_MacOSX-{x86_64,aarch64}.nativelib + cp src/main/resources/liblightningjni_MacOSX-*.nativelib "ldk-java-bins/${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/" + cd ldk-java-bins + # Sadly, OSX binaries are not currently deterministic, more debugging is needed. + #git diff --exit-code + fi + - name: Run Java Tests against release bins + run: | + if [ "${{ matrix.platform }}" != "macos-11" ]; then + export LDK_GARBAGECOLLECTED_GIT_OVERRIDE="$(cat .git_ver)" + cp "ldk-java-bins/${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/"liblightningjni_MacOSX-{x86_64,aarch64}.nativelib src/main/resources/ + mvn clean + mvn -DskipTests=true package + 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 + cd .. fi