Changeset 15520


Ignore:
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:
1 added
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/.github/workflows/abcl-test.yml

    r15485 r15520  
    1010      matrix:
    1111        os: [ubuntu-latest, macos-latest]
    12         jdk: [openjdk8, openjdk11, openjdk15]
     12        jdk: [openjdk8, openjdk11, openjdk16]
    1313       
    1414    steps:
     
    3030        run: bash -x ./ci/ensure-jenv-is-present.bash && ant abcl.diagnostic
    3131       
    32       - name: Install AdoptJDK
    33         run: bash -x ./ci/install-adoptjdk.bash ${JDK_VERSION}
     32      - name: Install OpenJDK
     33        run: bash -x ./ci/install-openjdk.bash ${JDK_VERSION}
    3434
    3535      - name: Set abcl.properties for build
  • trunk/abcl/.travis.yml

    r15385 r15520  
    3434  - ABCL_JDK=openjdk8  ABCL_ROOT=${TRAVIS_BUILD_DIR}
    3535  - ABCL_JDK=openjdk11 ABCL_ROOT=${TRAVIS_BUILD_DIR}
    36   - ABCL_JDK=openjdk15 ABCL_ROOT=${TRAVIS_BUILD_DIR}
     36  - ABCL_JDK=openjdk16 ABCL_ROOT=${TRAVIS_BUILD_DIR}
    3737
    3838install:
    3939  - echo PWD=$(pwd) && echo ABCL_ROOT=${ABCL_ROOT}
    40   - bash -x ${ABCL_ROOT}/ci/install-adoptjdk.bash ${ABCL_JDK}
     40  - bash -x ${ABCL_ROOT}/ci/install-openjdk.bash ${ABCL_JDK}
    4141
    4242  # Ensure we can invoke ant
  • trunk/abcl/abcl.rdf

    r15507 r15520  
    194194  rdf:_14  openjdk:14 ;
    195195  rdf:_15  openjdk:15 ;
     196  rdf:_16  openjdk:16 ;
    196197  rdfs:comment "Compatible Java runtimes" .
    197198
     
    203204    openjdk:13 "-XX:CompileThreshold=10" ;
    204205    openjdk:14 "-XX:CompileThreshold=10" ;
     206    openjdk:15 "-XX:CompileThreshold=10" ;
     207    openjdk:16 "-XX:CompileThreshold=10" ;
    205208    rdfs:comment "Java platform runtime options" .
    206209
     
    223226   rdf:_13  openjdk:13 ;
    224227   rdf:_14  openjdk:14 ;
    225    rdf:_14  openjdk:15 ;
     228   rdf:_15  openjdk:15 ;
     229   rdf:_16  openjdk:16 ;
    226230   rdfs:comment "Supported build platforms" .
    227231
Note: See TracChangeset for help on using the changeset viewer.