Correct the build matrix

quarkusio · Apr 20, 2023 · b32c35d · b32c35d
1 parent 8283de2
commit b32c35d
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 35 deletions.
diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml
@@ -20,24 +20,18 @@ jobs:
           - "default"
           - "9.1"
         include:
-          - name: "base images"
-            modules: "quarkus-distroless-base-image,quarkus-micro-base-image"
+          - modules: quarkus-distroless-base-image,quarkus-micro-base-image
             args: ""
-          - name: "s2i images"
-            modules: "quarkus-binary-s2i,quarkus-native-s2i"
+          - modules: quarkus-binary-s2i,quarkus-native-s2i
             args: ""
-          - name: "mandrel builder images"
-            modules: "quarkus-mandrel-builder-image"
+          - modules: quarkus-mandrel-builder-image
             args: ""
-          - name: "mandrel builder images 21 and 22.0"
-            modules: "quarkus-mandrel-builder-image"
-            args: "-Polder-mandrel"
-          - name: "graalvm ce builder images"
-            modules: "quarkus-graalvm-builder-image"
+          - modules: quarkus-mandrel-builder-image
+            args: -Polder-mandrel
+          - modules: quarkus-graalvm-builder-image
             args: ""
-          - name: "graalvm ce builder images 21 and 22.0"
-            modules: "quarkus-graalvm-builder-image"
-            args: "-Polder-graalvm"            
+          - modules: quarkus-graalvm-builder-image
+            args: -Polder-graalvm
 
     steps:
     - id: prepare
@@ -50,7 +44,7 @@ jobs:
         df -h
         
         # Set up UBI params
-        if [ "${{ matrix.ubi }}" != "default" ]; then
+        if [ -n "${{ matrix.ubi }}" ] && [ "${{ matrix.ubi }}" != "default" ]; then
           IFS='.' read -r ubi_major ubi_minor <<< "${{ matrix.ubi }}"
           echo "ubi-args=-Dubi.tag=ubi${ubi_major} -Dubi.rel.major=${ubi_major} -Dubi.rel.minor=${ubi_minor}" >> "$GITHUB_OUTPUT"
         else

diff --git a/.github/workflows/push-images.yml b/.github/workflows/push-images.yml
@@ -14,27 +14,21 @@ jobs:
       fail-fast: false
       matrix:
         ubi:
-          - "ubi8"
-          - "ubi9"
+          - "default"
+          - "9.1"
         include:
-          - name: "base images"
-            modules: "quarkus-distroless-base-image,quarkus-micro-base-image"
+          - modules: quarkus-distroless-base-image,quarkus-micro-base-image
             args: ""
-          - name: "s2i images"
-            modules: "quarkus-binary-s2i,quarkus-native-s2i"
+          - modules: quarkus-binary-s2i,quarkus-native-s2i
             args: ""
-          - name: "mandrel builder images"
-            modules: "quarkus-mandrel-builder-image"
+          - modules: quarkus-mandrel-builder-image
             args: ""
-          - name: "mandrel builder images 21 and 22.0"
-            modules: "quarkus-mandrel-builder-image"
-            args: "-Polder-mandrel"
-          - name: "graalvm ce builder images"
-            modules: "quarkus-graalvm-builder-image"
+          - modules: quarkus-mandrel-builder-image
+            args: -Polder-mandrel
+          - modules: quarkus-graalvm-builder-image
             args: ""
-          - name: "graalvm ce builder images 21 and 22.0"
-            modules: "quarkus-graalvm-builder-image"
-            args: "-Polder-graalvm"
+          - modules: quarkus-graalvm-builder-image
+            args: -Polder-graalvm
     steps:
       - id: prepare
         run: |

diff --git a/pom.xml b/pom.xml
@@ -33,15 +33,15 @@
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
 
-        <!-- Will be used as a prefix to the output image name -->
-        <ubi.tag>ubi</ubi.tag>
-        <ubi.release>${ubi.rel.major}.${ubi.rel.minor}</ubi.release>
-
         <!-- ubi-minimal: https://catalog.redhat.com/software/containers/ubi8/ubi-minimal/5c359a62bed8bd75a2c3fba8 -->
         <!-- ubi-micro:   https://catalog.redhat.com/software/containers/ubi8/ubi-micro/5ff3f50a831939b08d1b832a -->
         <ubi.rel.major>8</ubi.rel.major>
         <ubi.rel.minor>7</ubi.rel.minor>
 
+        <!-- Will be used as a prefix to the output image name -->
+        <ubi.tag>ubi</ubi.tag>
+        <ubi.release>${ubi.rel.major}.${ubi.rel.minor}</ubi.release>
+
         <ubi-min.base>registry.access.redhat.com/ubi${ubi.rel.major}/ubi-minimal:${ubi.release}</ubi-min.base>
         <ubi-micro.base>registry.access.redhat.com/ubi${ubi.rel.major}-micro:${ubi.release}</ubi-micro.base>