Skip to content

Commit

Permalink
Fix jdkHome in the toolchains for osx in Travis CI.
Browse files Browse the repository at this point in the history
  • Loading branch information
kaitoy committed Nov 22, 2019
1 parent cd090a3 commit 0b4fad8
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ matrix:
packages:
- openjdk-6-jdk
- os: osx
osx_image: xcode10.1 # OpenJDK 11.0.1+13
osx_image: xcode10.1
jdk: openjdk11
addons:
homebrew:
Expand Down Expand Up @@ -60,7 +60,6 @@ script:
sudo ./mvnw --global-toolchains mvn/toolchains_travis_11.xml -Dorg.pcap4j.core.pcapLibName=/usr/local/lib/libpcap.so -Dorg.pcap4j.jre6-test.jvm=/usr/lib/jvm/java-6-openjdk-amd64/jre/bin/java -B install
fi
else
ls /Library/Java/JavaVirtualMachines/
sudo ./mvnw --global-toolchains mvn/toolchains_travis_mac.xml -B -Djna.library.path="$(find /usr/local/Cellar/libpcap/ -name lib)" install
fi
Expand Down
2 changes: 1 addition & 1 deletion mvn/toolchains_travis_mac.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<version>11</version>
</provides>
<configuration>
<jdkHome>/Library/Java/JavaVirtualMachines/openjdk-11.0.1.jdk/Contents/Home</jdkHome>
<jdkHome>/Users/travis/openjdk11</jdkHome>
</configuration>
</toolchain>

Expand Down

0 comments on commit 0b4fad8

Please sign in to comment.