From f526843c78c6387229484cb0f7061afe7cda4137 Mon Sep 17 00:00:00 2001
From: m2 <69128853+m2Giles@users.noreply.github.com>
Date: Wed, 13 Nov 2024 07:43:06 -0500
Subject: [PATCH 1/2] fix(ci): Fix ISO upload/Changelogs Conditionals

---
 .github/changelogs.py                    | 4 ++--
 .github/workflows/reusable-build-iso.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/changelogs.py b/.github/changelogs.py
index 514ad3ab267..0de9920b419 100644
--- a/.github/changelogs.py
+++ b/.github/changelogs.py
@@ -104,9 +104,9 @@
 
 
 def get_images(target: str):
-    if target == "latest":
+    if "latest" in target:
         matrix = IMAGE_MATRIX_LATEST
-    elif target == "gts":
+    elif "gts" in target:
         matrix = IMAGE_MATRIX_GTS
     else:
         matrix = IMAGE_MATRIX
diff --git a/.github/workflows/reusable-build-iso.yml b/.github/workflows/reusable-build-iso.yml
index f8123ea6ab7..4b83399043e 100644
--- a/.github/workflows/reusable-build-iso.yml
+++ b/.github/workflows/reusable-build-iso.yml
@@ -86,7 +86,7 @@ jobs:
           overwrite: true
 
       - name: Upload ISOs and Checksum to R2 to Bluefin Bucket
-        if: github.ref_name == 'main' && contains(matrix.brand_name,'bluefin')
+        if: github.ref_name == 'main' && contains(matrix.base_name,'bluefin')
         shell: bash
         env:
           RCLONE_CONFIG_R2_TYPE: s3
@@ -102,7 +102,7 @@ jobs:
           rclone copy $SOURCE_DIR R2:bluefin
 
       - name: Upload ISOs and Checksum to R2 to Aurora Bucket
-        if: github.ref_name == 'main' && contains(matrix.brand_name,'aurora')
+        if: github.ref_name == 'main' && contains(matrix.base_name,'aurora')
         shell: bash
         env:
           RCLONE_CONFIG_R2_TYPE: s3

From be8851bfae31c0fa83a2a54ecfaf42bb5f7741a6 Mon Sep 17 00:00:00 2001
From: m2 <69128853+m2Giles@users.noreply.github.com>
Date: Wed, 13 Nov 2024 07:49:37 -0500
Subject: [PATCH 2/2] fix-regex with new tags

---
 .github/changelogs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/changelogs.py b/.github/changelogs.py
index 0de9920b419..73e4776663f 100644
--- a/.github/changelogs.py
+++ b/.github/changelogs.py
@@ -27,7 +27,7 @@
 RETRIES = 3
 RETRY_WAIT = 5
 FEDORA_PATTERN = re.compile(r"\.fc\d\d")
-START_PATTERN = lambda target: re.compile(rf"{target}-[0-9]+")
+START_PATTERN = lambda target: re.compile(rf"{target}-\d\d\d+")
 
 PATTERN_ADD = "\n| ✨ | {name} | | {version} |"
 PATTERN_CHANGE = "\n| 🔄 | {name} | {prev} | {new} |"