chore(ci): fix iso names for cloudflare bucket (#1928)

Nvidia images have skew

.github/workflows/build-iso-latest.yml

@@ -22,6 +22,6 @@ jobs:
       matrix:
         brand_name: ${{ fromJson(inputs.brand_name || '["bluefin", "aurora"]') }}
     with:
-      image_flavors: '["main", "nvidia", "hwe", "hwe-nvidia"]'
+      image_flavors: '["main", "nvidia", "asus", "asus-nvidia", "surface", "surface-nvidia"]'
       brand_name: ${{ matrix.brand_name }}
       stream_name: latest

.github/workflows/generate-release.yml

@@ -28,11 +28,11 @@ on:
           - '["gts", "stable"]'
           - '["gts"]'
           - '["stable"]'
-          - '["stable-daily"]'
-          - '["latest"]'
-          - '["beta"]'
-          - '["stable-daily", "latest", "beta"]'
-          - '["gts", "stable", "stable-daily", "latest", "beta"]'
+          # - '["stable-daily"]'
+          # - '["latest"]'
+          # - '["beta"]'
+          # - '["stable-daily", "latest", "beta"]'
+          # - '["gts", "stable", "stable-daily", "latest", "beta"]'
 
 permissions:
   contents: write
@@ -78,7 +78,7 @@ jobs:
 
       - name: Create Release
         uses: softprops/action-gh-release@v2
-        if: contains(fromJson('["gts", "stable"]'), matrix.version) && github.event_name.schedule == '45 5 * * 0' || contains(fromJson('["workflow_dispatch", "workflow_call"]'), github.event_name)
+        if: contains(fromJson('["gts", "stable"]'), matrix.version) && (github.event_name.schedule == '45 5 * * 0' || contains(fromJson('["workflow_dispatch", "workflow_call"]'), github.event_name))
         with:
           name: ${{ steps.generate-release-text.outputs.title }}
           tag_name: ${{ steps.generate-release-text.outputs.tag }}

.github/workflows/reusable-build-iso.yml

@@ -62,7 +62,7 @@ jobs:
           just build-iso "${{ matrix.base_name }}" "${{ matrix.stream_name }}" "${{ matrix.image_flavor }}" "1" "1"
           echo "IMAGE_NAME=${image_name}" >> $GITHUB_ENV
           echo "ISO_BUILD_DIR=${{ github.workspace }}/${image_name}_build" >> $GITHUB_ENV
-          echo "ISO_NAME=${image_name}.iso" >> $GITHUB_ENV
+          echo "ISO_NAME=${image_name}-${{ matrix.stream_name }}.iso" >> $GITHUB_ENV
 
       - name: Move ISOs to Upload Directory
         id: upload-directory

Justfile

@@ -12,6 +12,10 @@ flavors := '(
     [nvidia]=nvidia
     [hwe]=hwe
     [hwe-nvidia]=hwe-nvidia
+    [asus]=asus
+    [asus-nvidia]=asus-nvidia
+    [surface]=surface
+    [surface-nvidia]=surface-nvidia
 )'
 tags := '(
     [gts]=gts
@@ -103,7 +107,7 @@ validate image="" tag="" flavor="":
         echo "Aurora Does not build GTS..."
         exit 1
     fi
-    if [[ ! "$checktag" =~ latest && "$checkflavor" =~ hwe ]]; then
+    if [[ ! "$checktag" =~ latest && "$checkflavor" =~ hwe|asus|surface ]]; then
         echo "HWE images are only built on latest..."
         exit 1
     fi
@@ -462,7 +466,7 @@ build-iso image="bluefin" tag="latest" flavor="main" ghcr="0" pipeline="0":
     build_dir="${image_name}_build"
     mkdir -p "$build_dir"
 
-    if [[ -f "${build_dir}/${image_name}.iso" || -f "${build_dir}/${image_name}.iso-CHECKSUM" ]]; then
+    if [[ -f "${build_dir}/${image_name}-${tag}.iso" || -f "${build_dir}/${image_name}-${tag}.iso-CHECKSUM" ]]; then
         echo "ERROR - ISO or Checksum already exist. Please mv or rm to build new ISO"
         exit 1
     fi
@@ -564,7 +568,7 @@ build-iso image="bluefin" tag="latest" flavor="main" ghcr="0" pipeline="0":
     	iso_build_args+=(IMAGE_SRC="containers-storage:${IMAGE_FULL}")
     fi
     iso_build_args+=(IMAGE_TAG="${tag}")
-    iso_build_args+=(ISO_NAME="/github/workspace/${build_dir}/${image_name}.iso")
+    iso_build_args+=(ISO_NAME="/github/workspace/${build_dir}/${image_name}-${tag}.iso")
     iso_build_args+=(SECURE_BOOT_KEY_URL="https://github.com/ublue-os/akmods/raw/main/certs/public_key.der")
     if [[ "${image_name}" =~ bluefin ]]; then
         iso_build_args+=(VARIANT="Silverblue")