Revert "try matrix in workflow call"

This reverts commit 637f641.
ublue-os · Nov 1, 2024 · a06e9a1 · a06e9a1
1 parent 637f641
commit a06e9a1
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 50 deletions.
diff --git a/.github/workflows/build-image-beta.yml b/.github/workflows/build-image-beta.yml
@@ -22,10 +22,6 @@ 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
@@ -16,10 +16,6 @@ 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
@@ -22,9 +22,5 @@ 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
@@ -16,10 +16,6 @@ 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
@@ -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)