Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
abcl
abcl
Commits
3e36eb01
Commit
3e36eb01
authored
Aug 25, 2021
by
Mark
Browse files
ci: move to Adoptium for openjdk download
The CIs now build and test with openjdk8, openjdk11, and openjdk16.
parent
2aae074e
Changes
4
Hide whitespace changes
Inline
Side-by-side
.github/workflows/abcl-test.yml
View file @
3e36eb01
...
...
@@ -9,7 +9,7 @@ jobs:
strategy
:
matrix
:
os
:
[
ubuntu-latest
,
macos-latest
]
jdk
:
[
openjdk8
,
openjdk11
,
openjdk1
5
]
jdk
:
[
openjdk8
,
openjdk11
,
openjdk1
6
]
steps
:
-
name
:
Set path for build scripts
...
...
@@ -29,8 +29,8 @@ jobs:
-
name
:
Setup jenv
run
:
bash -x ./ci/ensure-jenv-is-present.bash && ant abcl.diagnostic
-
name
:
Install
Adopt
JDK
run
:
bash -x ./ci/install-
adopt
jdk.bash ${JDK_VERSION}
-
name
:
Install
Open
JDK
run
:
bash -x ./ci/install-
open
jdk.bash ${JDK_VERSION}
-
name
:
Set abcl.properties for build
run
:
bash -x ./ci/create-abcl-properties.bash ${JDK_VERSION}
...
...
.travis.yml
View file @
3e36eb01
...
...
@@ -33,11 +33,11 @@ addons:
env
:
-
ABCL_JDK=openjdk8 ABCL_ROOT=${TRAVIS_BUILD_DIR}
-
ABCL_JDK=openjdk11 ABCL_ROOT=${TRAVIS_BUILD_DIR}
-
ABCL_JDK=openjdk1
5
ABCL_ROOT=${TRAVIS_BUILD_DIR}
-
ABCL_JDK=openjdk1
6
ABCL_ROOT=${TRAVIS_BUILD_DIR}
install
:
-
echo PWD=$(pwd) && echo ABCL_ROOT=${ABCL_ROOT}
-
bash -x ${ABCL_ROOT}/ci/install-
adopt
jdk.bash ${ABCL_JDK}
-
bash -x ${ABCL_ROOT}/ci/install-
open
jdk.bash ${ABCL_JDK}
# Ensure we can invoke ant
-
. ${ABCL_ROOT}/ci/ensure-jenv-is-present.bash && ant abcl.diagnostic
...
...
abcl.rdf
View file @
3e36eb01
...
...
@@ -193,6 +193,7 @@ abcl:jss
rdf:_13 openjdk:13 ;
rdf:_14 openjdk:14 ;
rdf:_15 openjdk:15 ;
rdf:_16 openjdk:16 ;
rdfs:comment "Compatible Java runtimes" .
[abcl:run _:options]
...
...
@@ -202,6 +203,8 @@ abcl:jss
openjdk:11 "-XX:CompileThreshold=10" ;
openjdk:13 "-XX:CompileThreshold=10" ;
openjdk:14 "-XX:CompileThreshold=10" ;
openjdk:15 "-XX:CompileThreshold=10" ;
openjdk:16 "-XX:CompileThreshold=10" ;
rdfs:comment "Java platform runtime options" .
[abcl:build _:options]
...
...
@@ -222,7 +225,8 @@ abcl:jss
rdf:_11 openjdk:11 ;
rdf:_13 openjdk:13 ;
rdf:_14 openjdk:14 ;
rdf:_14 openjdk:15 ;
rdf:_15 openjdk:15 ;
rdf:_16 openjdk:16 ;
rdfs:comment "Supported build platforms" .
...
...
ci/install-
adopt
jdk.bash
→
ci/install-
open
jdk.bash
View file @
3e36eb01
...
...
@@ -12,46 +12,52 @@ fi
# lexically scoped in their modification.
topdir
=
dist
=
function
determine_
adopt
jdk
()
{
function
determine_
open
jdk
()
{
case
$(
uname
)
in
Darwin
)
case
$jdk
in
openjdk8
)
topdir
=
jdk8u
265
-b0
1
dist
=
"https://github.com/
A
dopt
OpenJDK/openjdk
8-binaries/releases/download/jdk8u
265
-b0
1
/OpenJDK8U-jdk_x64_mac_hotspot_8u
265
b0
1
.tar.gz"
topdir
=
jdk8u
302
-b0
8
dist
=
"https://github.com/
a
dopt
ium/temurin
8-binaries/releases/download/jdk8u
302
-b0
8
/OpenJDK8U-jdk_x64_mac_hotspot_8u
302
b0
8
.tar.gz"
;;
openjdk11
)
topdir
=
jdk-11.0.
8+10
dist
=
"https://github.com/
A
dopt
OpenJDK/openjdk
11-binaries/releases/download/jdk-11.0.
8
%2B
10
/OpenJDK11U-jdk_x64_mac_hotspot_11.0.
8_10
.tar.gz"
topdir
=
jdk-11.0.
12+7
dist
=
"https://github.com/
a
dopt
ium/temurin
11-binaries/releases/download/jdk-11.0.
12
%2B
7
/OpenJDK11U-jdk_x64_mac_hotspot_11.0.
12_7
.tar.gz"
;;
openjdk14
)
openjdk14
)
# Need version from adoptium
topdir
=
jdk-14.0.2+12
dist
=
"https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jdk_x64_mac_hotspot_14.0.2_12.tar.gz"
;;
openjdk15
)
openjdk15
)
# Need version from adoptium
topdir
=
jdk-15+36
dist
=
"https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36/OpenJDK15U-jdk_x64_mac_hotspot_15_36.tar.gz"
;;
openjdk16
)
topdir
=
jdk-16.0.2+7
dist
=
"https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_mac_hotspot_16.0.2_7.tar.gz"
esac
;;
Linux
)
case
$jdk
in
openjdk8
)
topdir
=
jdk8u
265
-b0
1
dist
=
"https://github.com/
A
dopt
OpenJDK/openjdk
8-binaries/releases/download/jdk8u
265
-b0
1
/OpenJDK8U-jdk_x64_linux_hotspot_8u
265
b0
1
.tar.gz"
topdir
=
jdk8u
302
-b0
8
dist
=
"https://github.com/
a
dopt
ium/temurin
8-binaries/releases/download/jdk8u
302
-b0
8
/OpenJDK8U-jdk_x64_linux_hotspot_8u
302
b0
8
.tar.gz"
;;
openjdk11
)
topdir
=
jdk-11.0.8+10
dist
=
"https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10/OpenJDK11U-jdk_x64_linux_hotspot_11.0.8_10.tar.gz"
;;
openjdk14
)
openjdk14
)
# Need version from adoptium
topdir
=
jdk-14.0.2+12
dist
=
"https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jdk_x64_linux_hotspot_14.0.2_12.tar.gz"
;;
openjdk15
)
openjdk15
)
# Need version from adoptium
topdir
=
jdk-15+36
dist
=
"https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36/OpenJDK15U-jdk_x64_linux_hotspot_15_36.tar.gz"
;;
openjdk16
)
topdir
=
jdk-16.0.2+7
dist
=
"https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz"
esac
;;
*
)
...
...
@@ -82,7 +88,7 @@ function add_jdk() {
esac
}
determine_
adopt
jdk
determine_
open
jdk
download_and_extract
add_jdk
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment