Skip to content

Commit fd279da

Browse files
committed
Fixed CI settings
1 parent d02e64f commit fd279da

File tree

3 files changed

+18
-16
lines changed

3 files changed

+18
-16
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ matrix:
6868
- openjdk18
6969

7070
- os: osx
71-
osx_image: xcode12.5
71+
osx_image: xcode13.4
7272
language: java
7373
jdk:
7474
- openjdk18

ci/osx/install.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ set -ev
77
JPACKAGE_JDK_BASE_URL=https://download.java.net/java/GA/jdk14.0.2/205943a0976c4ed48cb16f1043c5c647/12/GPL
88
JPACKAGE_JDK_ARCHIVE_NAME=openjdk-14.0.2_osx-x64_bin.tar.gz
99
JPACKAGE_JDK_HOME=jdk-14.0.2.jdk/Contents/Home
10+
1011
wget -q $JPACKAGE_JDK_BASE_URL/$JPACKAGE_JDK_ARCHIVE_NAME
1112
tar xzfp $JPACKAGE_JDK_ARCHIVE_NAME
1213
echo "export JPACKAGE_HOME=$(pwd)/$JPACKAGE_JDK_HOME" >> .travis.env

ci/windows/install.sh

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,30 @@
44

55
set -ev
66

7+
JAVA_JDK_BASE_URL=https://download.bell-sw.com/java/18.0.1+12
8+
JAVA_JDK_ARCHIVE_NAME=bellsoft-jdk18.0.1+12-windows-amd64.zip
9+
JAVA_JDK_HOME=jdk-18.0.1
10+
11+
wget -q $JAVA_JDK_BASE_URL/$JAVA_JDK_ARCHIVE_NAME
12+
7z x -bd $JAVA_JDK_ARCHIVE_NAME
13+
echo "export JAVA_HOME=$(pwd)/$JAVA_JDK_HOME" >> .travis.env
14+
715
JPACKAGE_JDK_BASE_URL=https://download.java.net/java/GA/jdk14.0.2/205943a0976c4ed48cb16f1043c5c647/12/GPL
816
JPACKAGE_JDK_ARCHIVE_NAME=openjdk-14.0.2_windows-x64_bin.zip
917
JPACKAGE_JDK_HOME=jdk-14.0.2
18+
1019
wget -q $JPACKAGE_JDK_BASE_URL/$JPACKAGE_JDK_ARCHIVE_NAME
1120
7z x -bd $JPACKAGE_JDK_ARCHIVE_NAME
1221
echo "export JPACKAGE_HOME=$(pwd)/$JPACKAGE_JDK_HOME" >> .travis.env
1322

14-
# FeatureMain Core AdoptOpenJDK installation (DEFAULT)
15-
# FeatureEnvironment Update the PATH environment variable (DEFAULT)
16-
# FeatureJarFileRunWith Associate .jar files with Java applications (DEFAULT)
17-
# FeatureJavaHome Update the JAVA_HOME environment variable
18-
# FeatureIcedTeaWeb Install IcedTea-Web
19-
# FeatureJNLPFileRunWith Associate .jnlp files with IcedTea-web
20-
# FeatureOracleJavaSoft Updates registry keys HKLM/SOFTWARE/JavaSoft/
21-
choco install libericajdk --version 18.0.1 -y -ia --params "/ADDLOCAL=FeatureMain,FeatureEnvironment,FeatureJavaHome"
22-
echo 'export JAVA_HOME="$JAVA_HOME"' >> .travis.env
23-
24-
# choco install wixtoolset -y
25-
wget -q https://github.com/wixtoolset/wix3/releases/download/wix3112rtm/wix311-binaries.zip
26-
7z x -bd -owixtoolset wix311-binaries.zip
27-
echo 'export WIX=$(pwd)/wixtoolset' >> .travis.env
23+
WIX_BASE_URL=https://github.com/wixtoolset/wix3/releases/download/wix3112rtm
24+
WIX_ARCHIVE_NAME=wix311-binaries.zip
25+
WIX_HOME=wix-3.11.2
26+
27+
wget -q $WIX_BASE_URL/$WIX_ARCHIVE_NAME
28+
7z x -bd -o$WIX_HOME wix311-binaries.zip
29+
echo 'export WIX=$(pwd)/$WIX_HOME' >> .travis.env
2830

2931
echo 'export PATH="$JAVA_HOME/bin":"$WIX":$PATH' >> .travis.env
3032

31-
# special for Windows
3233
echo 'export GRADLE_OPTS="-Dorg.gradle.daemon=false"' >> .travis.env

0 commit comments

Comments
 (0)