From f06a0ad6f47635fc10ef091d7d08e99fb8c32b7b Mon Sep 17 00:00:00 2001
From: Noel Miller <noelmiller@protonmail.com>
Date: Wed, 6 Mar 2024 00:37:28 -0600
Subject: [PATCH] feat: added ISO_NAME as param

---
 .github/workflows/build-and-test.yml | 6 ++++--
 Containerfile                        | 1 +
 action.yml                           | 5 +++++
 entrypoint.sh                        | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 0371e3c..2f02066 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -17,6 +17,7 @@ env:
   VARIANT: 'Server'
   SECURE_BOOT_KEY_URL: 'https://github.com/ublue-os/akmods/raw/main/certs/public_key.der'
   ENROLLMENT_PASSWORD: 'container-installer'
+  ISO_NAME: ${{ env.IMAGE_NAME }}-${{ env.IMAGE_VERSION }}
 
 
 jobs:
@@ -92,13 +93,14 @@ jobs:
           variant: ${{ env.VARIANT }}
           secure_boot_key_url: ${{ env.SECURE_BOOT_KEY_URL }}
           enrollment_password: ${{ env.ENROLLMENT_PASSWORD }}
+          iso_name: ${{ env.ISO_NAME }}
 
       - name: Upload ISO as artifact
         id: upload
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ env.IMAGE_NAME }}-${{ env.VERSION }}.iso
-          path: ${{ github.workspace}}/${{ env.IMAGE_NAME }}-${{ env.VERSION }}.iso
+          name: ${{ env.ISO_NAME }}.iso
+          path: ${{ github.workspace}}/${{ env.ISO_NAME }}.iso
           if-no-files-found: error
           retention-days: 0
           compression-level: 0
diff --git a/Containerfile b/Containerfile
index 7488139..a1cbe07 100644
--- a/Containerfile
+++ b/Containerfile
@@ -9,6 +9,7 @@ ENV IMAGE_TAG="${VERSION}"
 ENV VARIANT="Server"
 ENV VERSION="${VERSION}"
 ENV WEB_UI="false"
+ENV ISO_NAME="${IMAGE_NAME}-${IMAGE_TAG}"
 
 RUN mkdir /build-container-installer
 
diff --git a/action.yml b/action.yml
index 27b52b6..5106143 100644
--- a/action.yml
+++ b/action.yml
@@ -29,6 +29,10 @@ inputs:
     description: Enable Anaconda WebUI
     required: false
     default: "false"
+  iso_name:
+    description: Used for specifying the name of the output iso
+    required: false
+    default: "${{ inputs.image_name }}-${{ inputs.image_tag || inputs.version }}"
   enrollment_password:
     description: Used for supporting secure boot (requires SECURE_BOOT_KEY_URL to be defined)
     required: false
@@ -61,6 +65,7 @@ runs:
           VERSION=${{ inputs.version }} \
           IMAGE_TAG=${{ inputs.image_tag || inputs.version }} \
           WEB_UI=${{ inputs.web_ui }} \
+          ISO_NAME=${{ inputs.iso_name }} \
           ENROLLMENT_PASSWORD=${{ inputs.enrollment_password }} \
           SECURE_BOOT_KEY_URL=${{ inputs.secure_boot_key_url }} \
           "ADDITIONAL_TEMPLATES=${{ inputs.additional_templates }}"
diff --git a/entrypoint.sh b/entrypoint.sh
index 2128598..78db352 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -15,4 +15,4 @@ make boot.iso $@
 # Add container to ISO
 make build/deploy.iso $@
 
-mv build/deploy.iso build/${IMAGE_NAME}-${VERSION}.iso
+mv build/deploy.iso build/${ISO_NAME}.iso