Update from JDK15 to JDK16 (#11218)

Motivation:

The last non-LTS release is JDK16 now.

Modifications:

Update from JDK15 to JDK16 for building as this is the last non-LTS release atm

Result:

Build with latest non-LTS release as well
This commit is contained in:
Norman Maurer 2021-05-03 18:15:37 +02:00 committed by GitHub
parent 612ab58448
commit dccdecc7f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 30 deletions

View File

@ -12,7 +12,7 @@ jobs:
include: include:
- setup: linux-x86_64-java8 - setup: linux-x86_64-java8
- setup: linux-x86_64-java11 - setup: linux-x86_64-java11
- setup: linux-x86_64-java15 - setup: linux-x86_64-java16
- setup: linux-x86_64-java11-boringssl - setup: linux-x86_64-java11-boringssl
steps: steps:
- name: Download Artifacts - name: Download Artifacts

View File

@ -86,9 +86,9 @@ jobs:
- setup: linux-x86_64-java11 - setup: linux-x86_64-java11
docker-compose-build: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.111.yaml build" docker-compose-build: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.111.yaml build"
docker-compose-run: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.111.yaml run build-leak" docker-compose-run: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.111.yaml run build-leak"
- setup: linux-x86_64-java15 - setup: linux-x86_64-java16
docker-compose-build: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.115.yaml build" docker-compose-build: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.116.yaml build"
docker-compose-run: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.115.yaml run build-leak" docker-compose-run: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.116.yaml run build-leak"
- setup: linux-x86_64-java11-boringssl - setup: linux-x86_64-java11-boringssl
docker-compose-build: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.111.yaml build" docker-compose-build: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.111.yaml build"
docker-compose-run: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.111.yaml run build-leak-boringssl-static" docker-compose-run: "-f docker/docker-compose.yaml -f docker/docker-compose.centos-6.111.yaml run build-leak-boringssl-static"

View File

@ -1,26 +0,0 @@
version: "3"
services:
runtime-setup:
image: netty:centos-6-1.15
build:
args:
# use zulu and not adoptjdk for now as adoptjdk15 does not support centos6
# https://github.com/AdoptOpenJDK/openjdk-build/issues/2097
java_version : "zulu@1.15.0-2"
build:
image: netty:centos-6-1.15
build-leak:
image: netty:centos-6-1.15
build-boringssl-static:
image: netty:centos-6-1.15
build-leak-boringssl-static:
image: netty:centos-6-1.15
shell:
image: netty:centos-6-1.15

View File

@ -0,0 +1,24 @@
version: "3"
services:
runtime-setup:
image: netty:centos-6-1.16
build:
args:
java_version : "adopt-openj9@1.16.0-1"
build:
image: netty:centos-6-1.16
build-leak:
image: netty:centos-6-1.16
build-boringssl-static:
image: netty:centos-6-1.16
build-leak-boringssl-static:
image: netty:centos-6-1.16
shell:
image: netty:centos-6-1.16