Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Script changes for building Java 16 docker images #527

Merged
merged 4 commits into from
Mar 18, 2021
Merged

Script changes for building Java 16 docker images #527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bb7f680
Script changes to add version 16 support.
dinogun Mar 17, 2021
d4347a7
Fix common_functions.sh for 16
dinogun Mar 17, 2021
17bd836
Update non-official config for java 16.
dinogun Mar 17, 2021
71fee28
Add Java 16 to git workflow for PR checks.
dinogun Mar 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/continuous-integration-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
matrix:
os: [windows-2016, windows-2019, ubuntu-20.04]
version: [8, 11, 14, 15]
version: [8, 11, 15, 16]
vm: [hotspot, openj9]
package: [jdk, jre]
runtype: [test]
Expand Down
6 changes: 3 additions & 3 deletions common_functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,16 @@ PR_TEST_OSES="ubuntu alpine ubi"
runtype="build"

# Current JVM versions supported
export supported_versions="8 11 14 15"
export latest_version="15"
export supported_versions="8 11 14 15 16"
export latest_version="16"

# Current builds supported
export supported_builds="releases nightly"

function check_version() {
version=$1
case ${version} in
8|9|10|11|12|13|14|15)
8|9|10|11|12|13|14|15|16)
;;
*)
echo "ERROR: Invalid version"
Expand Down
44 changes: 43 additions & 1 deletion config/hotspot-official.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#

OS: ubuntu windowsservercore-1809 windowsservercore-ltsc2016 nanoserver-1809
Versions: 8 11 14 15
Versions: 8 11 14 15 16

Build: releases
Type: full
Expand Down Expand Up @@ -218,3 +218,45 @@ Build: releases
Type: full
Architectures: windows-nano
Directory: 15/jre/windows/nanoserver-1809

######################################################################

Build: releases
Type: full
Architectures: aarch64 armv7l x86_64 ppc64le s390x
Directory: 16/jdk/ubuntu

Build: releases
Type: full
Architectures: windows-amd
Directory: 16/jdk/windows/windowsservercore-1809

Build: releases
Type: full
Architectures: windows-amd
Directory: 16/jdk/windows/windowsservercore-ltsc2016

Build: releases
Type: full
Architectures: windows-nano
Directory: 16/jdk/windows/nanoserver-1809

Build: releases
Type: full
Architectures: aarch64 armv7l x86_64 ppc64le s390x
Directory: 16/jre/ubuntu

Build: releases
Type: full
Architectures: windows-amd
Directory: 16/jre/windows/windowsservercore-1809

Build: releases
Type: full
Architectures: windows-amd
Directory: 16/jre/windows/windowsservercore-ltsc2016

Build: releases
Type: full
Architectures: windows-nano
Directory: 16/jre/windows/nanoserver-1809
164 changes: 163 additions & 1 deletion config/hotspot.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#

OS: alpine debian debianslim ubi ubi-minimal centos clefos ubuntu leap tumbleweed windowsservercore-1809 windowsservercore-ltsc2016 nanoserver-1809 windowsservercore-1909 windowsservercore-ltsc2019 nanoserver-1909
Versions: 8 11 14 15
Versions: 8 11 14 15 16

Build: releases nightly
Type: full slim
Expand Down Expand Up @@ -598,3 +598,165 @@ Build: nightly
Type: full slim
Architectures: windows-nano
Directory: 15/jre/windows/nanoserver-1909

###############################################################################

Build: releases nightly
Type: full slim
Architectures: x86_64
Directory: 16/jdk/alpine

Build: releases nightly
Type: full slim
Architectures: aarch64 armv7l x86_64 ppc64le s390x
Directory: 16/jdk/debian

Build: releases nightly
Type: full slim
Architectures: aarch64 armv7l x86_64 ppc64le s390x
Directory: 16/jdk/debianslim

Build: releases nightly
Type: full slim
Architectures: aarch64 x86_64 ppc64le s390x
Directory: 16/jdk/ubi

Build: releases nightly
Type: full
Architectures: aarch64 x86_64 ppc64le s390x
Directory: 16/jdk/ubi-minimal

Build: releases nightly
Type: full slim
Architectures: aarch64 armv7l x86_64 ppc64le
Directory: 16/jdk/centos

Build: releases nightly
Type: full slim
Architectures: s390x
Directory: 16/jdk/clefos

Build: releases nightly
Type: full
Architectures: aarch64 armv7l x86_64 ppc64le
Directory: 16/jdk/leap

Build: releases nightly
Type: full
Architectures: aarch64 armv7l x86_64 ppc64le s390x
Directory: 16/jdk/tumbleweed

Build: releases nightly
Type: full slim
Architectures: aarch64 armv7l x86_64 ppc64le s390x
Directory: 16/jdk/ubuntu

Build: nightly
Type: full
Architectures: windows-amd
Directory: 16/jdk/windows/windowsservercore-1809

Build: nightly
Type: full
Architectures: windows-amd
Directory: 16/jdk/windows/windowsservercore-ltsc2016

Build: nightly
Type: full slim
Architectures: windows-nano
Directory: 16/jdk/windows/nanoserver-1809

Build: nightly
Type: full
Architectures: windows-amd
Directory: 16/jdk/windows/windowsservercore-1909

Build: nightly
Type: full
Architectures: windows-amd
Directory: 16/jdk/windows/windowsservercore-ltsc2019

Build: nightly
Type: full slim
Architectures: windows-nano
Directory: 16/jdk/windows/nanoserver-1909

Build: releases nightly
Type: full
Architectures: x86_64
Directory: 16/jre/alpine

Build: releases nightly
Type: full
Architectures: aarch64 armv7l x86_64 ppc64le s390x
Directory: 16/jre/debian

Build: releases nightly
Type: full
Architectures: aarch64 armv7l x86_64 ppc64le s390x
Directory: 16/jre/debianslim

Build: releases nightly
Type: full
Architectures: aarch64 x86_64 ppc64le s390x
Directory: 16/jre/ubi

Build: releases nightly
Type: full
Architectures: aarch64 x86_64 ppc64le s390x
Directory: 16/jre/ubi-minimal

Build: releases nightly
Type: full
Architectures: aarch64 armv7l x86_64 ppc64le
Directory: 16/jre/centos

Build: releases nightly
Type: full
Architectures: s390x
Directory: 16/jre/clefos

Build: releases nightly
Type: full
Architectures: aarch64 armv7l x86_64 ppc64le
Directory: 16/jre/leap

Build: releases nightly
Type: full
Architectures: aarch64 armv7l x86_64 ppc64le s390x
Directory: 16/jre/tumbleweed

Build: releases nightly
Type: full
Architectures: aarch64 armv7l x86_64 ppc64le s390x
Directory: 16/jre/ubuntu

Build: nightly
Type: full
Architectures: windows-amd
Directory: 16/jre/windows/windowsservercore-1809

Build: nightly
Type: full
Architectures: windows-amd
Directory: 16/jre/windows/windowsservercore-ltsc2016

Build: nightly
Type: full slim
Architectures: windows-nano
Directory: 16/jre/windows/nanoserver-1809

Build: nightly
Type: full
Architectures: windows-amd
Directory: 16/jre/windows/windowsservercore-1909

Build: nightly
Type: full
Architectures: windows-amd
Directory: 16/jre/windows/windowsservercore-ltsc2019

Build: nightly
Type: full slim
Architectures: windows-nano
Directory: 16/jre/windows/nanoserver-1909
44 changes: 43 additions & 1 deletion config/openj9-official.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#

OS: ubuntu windowsservercore-1809 windowsservercore-ltsc2016
Versions: 8 11 14 15
Versions: 8 11 14 15 16

Build: releases
Type: full
Expand Down Expand Up @@ -218,3 +218,45 @@ Build: releases
Type: full
Architectures: windows-nano
Directory: 15/jre/windows/nanoserver-1809

######################################################################

Build: releases
Type: full
Architectures: x86_64 ppc64le s390x
Directory: 16/jdk/ubuntu

Build: releases
Type: full
Architectures: windows-amd
Directory: 16/jdk/windows/windowsservercore-1809

Build: releases
Type: full
Architectures: windows-amd
Directory: 16/jdk/windows/windowsservercore-ltsc2016

Build: releases
Type: full
Architectures: windows-nano
Directory: 16/jdk/windows/nanoserver-1809

Build: releases
Type: full
Architectures: x86_64 ppc64le s390x
Directory: 16/jre/ubuntu

Build: releases
Type: full
Architectures: windows-amd
Directory: 16/jre/windows/windowsservercore-1809

Build: releases
Type: full
Architectures: windows-amd
Directory: 16/jre/windows/windowsservercore-ltsc2016

Build: releases
Type: full
Architectures: windows-nano
Directory: 16/jre/windows/nanoserver-1809
Loading