From 68d80452e63202c8b7ff53689dd9ddf167614d74 Mon Sep 17 00:00:00 2001
From: "Jason N." <33561705+JasonN3@users.noreply.github.com>
Date: Thu, 9 May 2024 11:56:42 -0400
Subject: [PATCH] move to matrix var with new repos

---
 .github/workflows/build_iso.yml  | 22 ++++++++--------------
 .github/workflows/build_vars.yml | 27 ++++++++++++++++++++-------
 2 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/build_iso.yml b/.github/workflows/build_iso.yml
index f115218..990de53 100644
--- a/.github/workflows/build_iso.yml
+++ b/.github/workflows/build_iso.yml
@@ -103,34 +103,28 @@ jobs:
       - name: Build ISO
         uses: ./
         id: build
-        env:
-          IMAGE_NAME: "${{ matrix.version == 'eln' && 'fedora-bootc' || needs.load_vars.outputs.IMAGE_NAME }}"
-          IMAGE_REPO: "${{ matrix.version == 'eln' && 'quay.io/centos-bootc' || needs.load_vars.outputs.IMAGE_REPO }}"
         with:
           arch: ${{ needs.load_vars.outputs.ARCH }}
-          image_name: ${{ env.IMAGE_NAME }}
-          image_repo: ${{ env.IMAGE_REPO}}
+          image_name: ${{ matrix.image_name }}
+          image_repo: ${{ matrix.image_repo}}
           image_tag: ${{ matrix.version }}
-          version: ${{ matrix.version == 'eln' && '9' || matrix.version }}
-          repos: ${{ matrix.version == 'eln' && 'repos/centos.repo' || '' }}
+          version: ${{ matrix.version }}
+          repos: ${{ matrix.repos }}
           variant: ${{ needs.load_vars.outputs.VARIANT }}
           flatpak_remote_refs: ${{ matrix.flatpaks == 'flatpak_refs' && needs.load_vars.outputs.FLATPAK_REMOTE_REFS || '' }}
           flatpak_remote_refs_dir: ${{ matrix.flatpaks == 'flatpak_refs_dir' && needs.load_vars.outputs.FLATPAK_REMOTE_REFS_DIR || '' }}
           secure_boot_key_url: ${{ needs.load_vars.outputs.SECURE_BOOT_KEY_URL }}
           enrollment_password: ${{ needs.load_vars.outputs.ENROLLMENT_PASSWORD }}
-          iso_name: build/${{ env.IMAGE_NAME }}-${{ matrix.version }}${{ matrix.flatpaks == 'false' && '' || format('-{0}', matrix.flatpaks) }}.iso
+          iso_name: build/${{ matrix.image_name }}-${{ matrix.version }}${{ matrix.flatpaks == 'false' && '' || format('-{0}', matrix.flatpaks) }}.iso
 
       - name: Upload ISO as artifact
         id: upload
         uses: actions/upload-artifact@v4
-        env:
-          IMAGE_NAME: "${{ matrix.version == 'eln' && 'fedora-bootc' || needs.load_vars.outputs.IMAGE_NAME }}"
-          IMAGE_REPO: "${{ matrix.version == 'eln' && 'quay.io/centos-bootc' || needs.load_vars.outputs.IMAGE_REPO }}"
         with:
-          name: ${{ env.IMAGE_NAME }}-${{ matrix.version }}${{ matrix.flatpaks == 'false' && '' || format('-{0}', matrix.flatpaks) }}
+          name: ${{ matrix.image_name }}-${{ matrix.version }}${{ matrix.flatpaks == 'false' && '' || format('-{0}', matrix.flatpaks) }}
           path: |
-            build/${{ env.IMAGE_NAME }}-${{ matrix.version }}${{ matrix.flatpaks == 'false' && '' || format('-{0}', matrix.flatpaks) }}.iso
-            build/${{ env.IMAGE_NAME }}-${{ matrix.version }}${{ matrix.flatpaks == 'false' && '' || format('-{0}', matrix.flatpaks) }}.iso-CHECKSUM
+            build/${{ matrix.image_name }}-${{ matrix.version }}${{ matrix.flatpaks == 'false' && '' || format('-{0}', matrix.flatpaks) }}.iso
+            build/${{ matrix.image_name }}-${{ matrix.version }}${{ matrix.flatpaks == 'false' && '' || format('-{0}', matrix.flatpaks) }}.iso-CHECKSUM
           if-no-files-found: error
           retention-days: 0
           compression-level: 0
diff --git a/.github/workflows/build_vars.yml b/.github/workflows/build_vars.yml
index 51368d4..4429086 100644
--- a/.github/workflows/build_vars.yml
+++ b/.github/workflows/build_vars.yml
@@ -12,7 +12,6 @@ on:
               "38", 
               "39", 
               "40", 
-              "eln"
             ], 
             "flatpaks": [
               "false",
@@ -21,19 +20,33 @@ on:
             ],
             "exclude": [
               {
-                "version": "eln",
+                "version": "40",
                 "flatpaks": "flatpak_dir"
               },
               {
-                "version": "eln",
+                "version": "40",
                 "flatpaks": "flatpak_refs"
               }
+            ],
+            "include": [
+              {
+                "version": "38",
+                "image_repo": "quay.io/fedora-ostree-desktops",
+                "image_name": "base"
+              },
+              {
+                "version": "39",
+                "image_repo": "quay.io/fedora-ostree-desktops",
+                "image_name": "base"
+              },
+              {
+                "version": "40",
+                "image_repo": "quay.io/fedora",
+                "image_name": "fedora-bootc",
+                "repos": "repos/centos.repo"
+              }
             ]
           }'
-      IMAGE_NAME:
-        value: 'base'
-      IMAGE_REPO:
-        value: 'quay.io/fedora-ostree-desktops'
       VARIANT:
         value: 'Server'
       FLATPAK_REMOTE_REFS_DIR: