Skip to content

Commit 7da8cb1

Browse files
committed
Fix Java path setting in OSX builds
1 parent 23cf651 commit 7da8cb1

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

.github/workflows/build.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -258,8 +258,6 @@ jobs:
258258
exit 1
259259
fi
260260
tar xvvf openjdk-16.0.1_osx-x64_bin.tar.gz
261-
export JAVA_HOME=`pwd`/jdk-16.0.1.jdk/Contents/Home
262-
export PATH=$JAVA_HOME/bin:$PATH
263261
- name: Checkout latest Linux binaries
264262
run: |
265263
export LDK_GARBAGECOLLECTED_GIT_OVERRIDE="$(git describe --tag HEAD)"
@@ -277,6 +275,8 @@ jobs:
277275
- name: Build Java/TS Release Bindings
278276
run: |
279277
export LDK_GARBAGECOLLECTED_GIT_OVERRIDE="$(git describe --tag HEAD)"
278+
export JAVA_HOME=`pwd`/jdk-16.0.1.jdk/Contents/Home
279+
export PATH=$JAVA_HOME/bin:$PATH
280280
# genbindings.sh always fails as there is no wasm32-wasi library
281281
# available, so instead we check that the expected JNI library
282282
# is created.
@@ -304,7 +304,9 @@ jobs:
304304
export PATH=apache-maven-3.8.4/bin:$PATH
305305
- name: Run Java Tests against built jar
306306
run: |
307-
mvn -q -B -DskipTests=true package
307+
export JAVA_HOME=`pwd`/jdk-16.0.1.jdk/Contents/Home
308+
export PATH=$JAVA_HOME/bin:$PATH
309+
mvn -DskipTests=true package
308310
export LDK_GARBAGECOLLECTED_GIT_OVERRIDE="$(git describe --tag HEAD)"
309311
JAR_VERSION=${LDK_GARBAGECOLLECTED_GIT_OVERRIDE:1:100}
310312
mvn install:install-file -Dfile=target/ldk-java-${JAR_VERSION}.jar -DgroupId=org.lightningdevkit -DartifactId=ldk-java -Dversion=1.0-SNAPSHOT -Dpackaging=jar
@@ -324,6 +326,8 @@ jobs:
324326
run: |
325327
if [ "${{ matrix.platform }}" != "macos-11" ]; then
326328
export LDK_GARBAGECOLLECTED_GIT_OVERRIDE="$(git describe --tag HEAD)"
329+
export JAVA_HOME=`pwd`/jdk-16.0.1.jdk/Contents/Home
330+
export PATH=$JAVA_HOME/bin:$PATH
327331
cp "ldk-java-bins/${LDK_GARBAGECOLLECTED_GIT_OVERRIDE}/"liblightningjni_MacOSX-{x86_64,aarch64}.nativelib src/main/resources/
328332
mvn clean
329333
mvn -q -B -DskipTests=true package

0 commit comments

Comments
 (0)