another matrix try

ublue-os · Nov 1, 2024 · d50912b · d50912b
1 parent 3c3daf1
commit d50912b
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 5 deletions.
diff --git a/.github/workflows/build-image-beta.yml b/.github/workflows/build-image-beta.yml
@@ -22,6 +22,10 @@ jobs:
     name: Build Beta Images
     uses: ./.github/workflows/reusable-build.yml
     secrets: inherit
+    strategy:
+      matrix:
+        base_name: [bluefin, aurora]
     with:
+      base_name: ${{ matrix.base_name }}
       fedora_version: beta
 
diff --git a/.github/workflows/build-image-gts.yml b/.github/workflows/build-image-gts.yml
@@ -16,6 +16,10 @@ jobs:
     name: Build GTS Images
     uses: ./.github/workflows/reusable-build.yml
     secrets: inherit
+    strategy:
+      matrix:
+        base_name: [bluefin]
     with:
+      base_name: ${{ matrix.base_name }}
       fedora_version: gts
 
diff --git a/.github/workflows/build-image-latest.yml b/.github/workflows/build-image-latest.yml
@@ -22,5 +22,9 @@ jobs:
     name: Build Latest Images
     uses: ./.github/workflows/reusable-build.yml
     secrets: inherit
+    strategy:
+      matrix:
+        base_name: [bluefin, aurora]
     with:
+      base_name: ${{ matrix.base_name }}
       fedora_version: latest
diff --git a/.github/workflows/build-image-stable.yml b/.github/workflows/build-image-stable.yml
@@ -16,6 +16,10 @@ jobs:
     name: Build Stable Images
     uses: ./.github/workflows/reusable-build.yml
     secrets: inherit
+    strategy:
+      matrix:
+        base_name: [bluefin, aurora]
     with:
+      base_name: ${{ matrix.base_name }}
       fedora_version: stable
 
diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml
@@ -2,6 +2,10 @@ name: Reusable Build and Push
 on:
   workflow_call:
     inputs:
+      base_name:
+        description: "The Brand Name: bluefin or aurora"
+        required: true
+        type: string
       fedora_version:
         description: "The Fedora Version: gts, stable, or latest"
         required: true
@@ -14,7 +18,7 @@ env:
   IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }}
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref || github.run_id }}-${{ inputs.fedora_version }}
+  group: ${{ github.workflow }}-${{ github.ref || github.run_id }}-${{ inputs.base_name}}-${{ inputs.fedora_version }}
   cancel-in-progress: true
 
 jobs:
@@ -33,10 +37,8 @@ jobs:
           - hwe
           - hwe-nvidia
         base_name:
-          - bluefin
-          - bluefin-dx
-          - aurora
-          - aurora-dx
+          - ${{ inputs.base_name }}
+          - ${{ inputs.base_name }}-dx
         fedora_version:
           - ${{ inputs.fedora_version }}
         exclude: