update jobs to add JVM based Java 21 build, account for native defaul…

…t now being 21, use newer specified image name for a 17+17 jvm+native build
amqphub · Nov 9, 2023 · bb306ca · bb306ca
1 parent a7579f6
commit bb306ca
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,11 +15,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ 11 , 17 ]
+        java: [ 11 , 17 , 21 ]
         mandrel: [ default ]
         include:
-          - java: 20
-            mandrel: "23.0"
+          - java: 17
+            mandrel: "17"
 
     steps:
       - uses: actions/checkout@v3
@@ -45,4 +45,4 @@ jobs:
 
       - name: Build - Native (Specific Builder Image)
         if: matrix.mandrel != 'default'
-        run: mvn -B clean verify -Dnative -Dquarkus.native.container-build=true -Dquarkus.native.builder-image=quay.io/quarkus/ubi-quarkus-mandrel-builder-image:${{ matrix.mandrel }}-java${{ matrix.java }}
+        run: mvn -B clean verify -Dnative -Dquarkus.native.container-build=true -Dquarkus.native.builder-image=quay.io/quarkus/ubi-quarkus-mandrel-builder-image:jdk-${{ matrix.mandrel }}
diff --git a/.github/workflows/cron-build-mains.yml b/.github/workflows/cron-build-mains.yml
@@ -13,11 +13,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ 11 , 17 ]
+        java: [ 11 , 17 , 21 ]
         mandrel: [ default ]
         include:
-          - java: 20
-            mandrel: "23.0"
+          - java: 17
+            mandrel: "17"
 
     steps:
       - uses: actions/checkout@v3
@@ -60,4 +60,4 @@ jobs:
 
       - name: Build - Native (Specific Builder Image)
         if: matrix.mandrel != 'default'
-        run: mvn -B -s .github/cron-maven-settings.xml clean verify -Pnative -Dquarkus.qpid.jms.group-id=org.amqphub.quarkus -Dquarkus.qpid.jms.version=999-SNAPSHOT -Dquarkus.platform.group-id=io.quarkus -Dquarkus.platform.version=999-SNAPSHOT -Dquarkus.native.container-build=true -Dquarkus.native.builder-image=quay.io/quarkus/ubi-quarkus-mandrel-builder-image:${{ matrix.mandrel }}-java${{ matrix.java }}
+        run: mvn -B -s .github/cron-maven-settings.xml clean verify -Pnative -Dquarkus.qpid.jms.group-id=org.amqphub.quarkus -Dquarkus.qpid.jms.version=999-SNAPSHOT -Dquarkus.platform.group-id=io.quarkus -Dquarkus.platform.version=999-SNAPSHOT -Dquarkus.native.container-build=true -Dquarkus.native.builder-image=quay.io/quarkus/ubi-quarkus-mandrel-builder-image:jdk-${{ matrix.mandrel }}