From 637f6415d28028f9f0d5363f16f7bd104fd18311 Mon Sep 17 00:00:00 2001
From: m2 <69128853+m2Giles@users.noreply.github.com>
Date: Fri, 1 Nov 2024 15:58:05 -0400
Subject: [PATCH] try matrix in workflow call

Signed-off-by: m2 <69128853+m2Giles@users.noreply.github.com>
---
 .github/workflows/build-image-beta.yml   |  4 ++
 .github/workflows/build-image-gts.yml    |  4 ++
 .github/workflows/build-image-latest.yml |  4 ++
 .github/workflows/build-image-stable.yml |  4 ++
 .github/workflows/reusable-build-iso.yml | 68 ++++++++++++------------
 5 files changed, 50 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/build-image-beta.yml b/.github/workflows/build-image-beta.yml
index 4ff39aa74fe..1216d13d57f 100644
--- 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:
+        image_flavor: [main, nvidia]
+        base_name: [bluefin, bluefin-dx, aurora, aurora-dx]
     with:
       fedora_version: beta
 
diff --git a/.github/workflows/build-image-gts.yml b/.github/workflows/build-image-gts.yml
index 2f9168ccd60..93b8ff0b10c 100644
--- 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:
+        image_flavor: [main, nvidia]
+        base_name: [bluefin, bluefin-dx]
     with:
       fedora_version: gts
 
diff --git a/.github/workflows/build-image-latest.yml b/.github/workflows/build-image-latest.yml
index 099bd2c6aea..e3fa35a1b09 100644
--- 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:
+        image_flavor: [main, nvidia, hwe, hwe-nvidia]
+        base_name: [bluefin, bluefin-dx, aurora, aurora-dx]
     with:
       fedora_version: latest
diff --git a/.github/workflows/build-image-stable.yml b/.github/workflows/build-image-stable.yml
index aa090078d97..c154f3b8c37 100644
--- 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:
+        image_flavor: [main, nvidia]
+        base_name: [bluefin, bluefin-dx, aurora, aurora-dx]
     with:
       fedora_version: stable
 
diff --git a/.github/workflows/reusable-build-iso.yml b/.github/workflows/reusable-build-iso.yml
index b5c5cd7f4fb..2f591f5f1c0 100644
--- a/.github/workflows/reusable-build-iso.yml
+++ b/.github/workflows/reusable-build-iso.yml
@@ -18,40 +18,40 @@ jobs:
       contents: read
       packages: write
       id-token: write
-    strategy:
-      fail-fast: false
-      matrix:
-        image_flavor:
-          - main
-          - nvidia
-          - asus
-          - asus-nvidia
-          - surface
-          - surface-nvidia
-        base_name:
-          - bluefin
-          - bluefin-dx
-          - aurora
-          - aurora-dx
-        fedora_version:
-          - ${{ inputs.fedora_version }}
-        exclude:
-          - fedora_version: gts
-            base_name: aurora
-          - fedora_version: gts
-            base_name: aurora-dx
-          - fedora_version: gts
-            image_flavor: hwe
-          - fedora_version: gts
-            image_flavor: hwe-nvidia
-          - fedora_version: stable
-            image_flavor: hwe
-          - fedora_version: stable
-            image_flavor: hwe-nvidia
-          - fedora_version: beta
-            image_flavor: hwe
-          - fedora_version: beta
-            image_flavor: hwe-nvidia
+    # strategy:
+    #   fail-fast: false
+    #   matrix:
+    #     image_flavor:
+    #       - main
+    #       - nvidia
+    #       - asus
+    #       - asus-nvidia
+    #       - surface
+    #       - surface-nvidia
+    #     base_name:
+    #       - bluefin
+    #       - bluefin-dx
+    #       - aurora
+    #       - aurora-dx
+    #     fedora_version:
+    #       - ${{ inputs.fedora_version }}
+    #     exclude:
+    #       - fedora_version: gts
+    #         base_name: aurora
+    #       - fedora_version: gts
+    #         base_name: aurora-dx
+    #       - fedora_version: gts
+    #         image_flavor: hwe
+    #       - fedora_version: gts
+    #         image_flavor: hwe-nvidia
+    #       - fedora_version: stable
+    #         image_flavor: hwe
+    #       - fedora_version: stable
+    #         image_flavor: hwe-nvidia
+    #       - fedora_version: beta
+    #         image_flavor: hwe
+    #       - fedora_version: beta
+    #         image_flavor: hwe-nvidia
 
     steps:
       - name: Free Disk Space (Ubuntu)