From e027a813176b16466f717494d545854bd4146929 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Fri, 21 May 2021 17:32:38 -0500 Subject: [PATCH] ci: add java11 to build/merge --- .github/workflows/build-multiarch.yml | 6 ++++-- docker-versions-create.sh | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml index d15c33c7..241ef4bb 100644 --- a/.github/workflows/build-multiarch.yml +++ b/.github/workflows/build-multiarch.yml @@ -5,13 +5,15 @@ on: - master - "*-multiarch" - "multiarch*" + - java11 - java15 - java16* - test/multiarch/* tags: - "[0-9]+.[0-9]+.[0-9]+" - - "[0-9]+.[0-9]+.[0-9]+-multiarch" - - "[0-9]+.[0-9]+.[0-9]+-multiarch-latest" + - "[0-9]+.[0-9]+.[0-9]+-multiarch*" + - "[0-9]+.[0-9]+.[0-9]+-*multiarch" + - "[0-9]+.[0-9]+.[0-9]+-java11" - "[0-9]+.[0-9]+.[0-9]+-java15" - "[0-9]+.[0-9]+.[0-9]+-java16*" paths-ignore: diff --git a/docker-versions-create.sh b/docker-versions-create.sh index b006f6aa..1c6d166a 100755 --- a/docker-versions-create.sh +++ b/docker-versions-create.sh @@ -6,7 +6,7 @@ branches_list=( 'java8-multiarch' 'openj9' 'openj9-11' - 'adopt11' + 'java11' 'java15' 'java16' 'java16-openj9'