Changeset 15520

Timestamp:

09/19/21 08:54:58 (17 months ago)

Author:

Mark Evenson

Message:

ci: move to Adoptium for openjdk download

The CIs now build and test with openjdk8, openjdk11, and openjdk16.

Location:

trunk/abcl

Files:

• .github/workflows/abcl-test.yml (modified) (2 diffs)
• .travis.yml (modified) (1 diff)
• abcl.rdf (modified) (3 diffs)
• ci/install-adoptjdk.bash (deleted)
• ci/install-openjdk.bash (added)

trunk/abcl/.github/workflows/abcl-test.yml

@@ -10 +10 @@
       matrix:
         os: [ubuntu-latest, macos-latest]
-        jdk: [openjdk8, openjdk11, openjdk15]
+        jdk: [openjdk8, openjdk11, openjdk16]
         
     steps:
@@ -30 +30 @@
         run: bash -x ./ci/ensure-jenv-is-present.bash && ant abcl.diagnostic
         
-      - name: Install AdoptJDK
-        run: bash -x ./ci/install-adoptjdk.bash ${JDK_VERSION}
+      - name: Install OpenJDK
+        run: bash -x ./ci/install-openjdk.bash ${JDK_VERSION}
 
       - name: Set abcl.properties for build

trunk/abcl/.travis.yml

@@ -34 +34 @@
   - ABCL_JDK=openjdk8  ABCL_ROOT=${TRAVIS_BUILD_DIR}
   - ABCL_JDK=openjdk11 ABCL_ROOT=${TRAVIS_BUILD_DIR}
-  - ABCL_JDK=openjdk15 ABCL_ROOT=${TRAVIS_BUILD_DIR}
+  - ABCL_JDK=openjdk16 ABCL_ROOT=${TRAVIS_BUILD_DIR}
 
 install:
   - echo PWD=$(pwd) && echo ABCL_ROOT=${ABCL_ROOT}
-  - bash -x ${ABCL_ROOT}/ci/install-adoptjdk.bash ${ABCL_JDK}
+  - bash -x ${ABCL_ROOT}/ci/install-openjdk.bash ${ABCL_JDK}
 
   # Ensure we can invoke ant

trunk/abcl/abcl.rdf

@@ -194 +194 @@
   rdf:_14  openjdk:14 ;
   rdf:_15  openjdk:15 ;
+  rdf:_16  openjdk:16 ;
   rdfs:comment "Compatible Java runtimes" .
 
@@ -203 +204 @@
     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" .
 
@@ -223 +226 @@
    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" .