From 1e4635d400890afb320aa718c40a1e14ffdb78ef Mon Sep 17 00:00:00 2001
From: "Jason N." <33561705+JasonN3@users.noreply.github.com>
Date: Sat, 30 Mar 2024 20:42:32 -0400
Subject: [PATCH] split tests

---
 .github/workflows/build_iso.yml |  9 ++++++---
 .github/workflows/tests.yml     | 16 +++++++++++++---
 action.yml                      | 24 ------------------------
 3 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/build_iso.yml b/.github/workflows/build_iso.yml
index 03ef271..7003990 100644
--- a/.github/workflows/build_iso.yml
+++ b/.github/workflows/build_iso.yml
@@ -7,6 +7,9 @@ on:
       parent_job_name:
         required: true
         type: string
+      flatpaks_refs_dir:
+        required: false
+        type: string
     outputs:
       iso_name-38:
         description: "Version 38 ISO Name"
@@ -125,10 +128,10 @@ jobs:
           image_tag: ${{ matrix.version }}
           version: ${{ matrix.version }}
           variant: ${{ needs.load_vars.outputs.VARIANT }}
-          flatpak_remote_refs_dir: /github/workspace/${{ needs.load_vars.outputs.FLATPAK_REMOTE_REFS_DIR }}
+          flatpak_remote_refs_dir: ${{ inputs.flatpaks_refs_dir }}
           secure_boot_key_url: ${{ needs.load_vars.outputs.SECURE_BOOT_KEY_URL }}
           enrollment_password: ${{ needs.load_vars.outputs.ENROLLMENT_PASSWORD }}
-          iso_name: ${{ needs.load_vars.outputs.IMAGE_NAME }}-${{ matrix.version }}.iso
+          iso_name: build/${{ needs.load_vars.outputs.IMAGE_NAME }}-${{ matrix.version }}.iso
 
       - name: Save output
         id: save_output
@@ -258,7 +261,7 @@ jobs:
           variant: ${{ needs.load_vars.outputs.VARIANT }}
           secure_boot_key_url: ${{ needs.load_vars.outputs.SECURE_BOOT_KEY_URL }}
           enrollment_password: ${{ needs.load_vars.outputs.ENROLLMENT_PASSWORD }}
-          iso_name: ${{ needs.load_vars.outputs.IMAGE_NAME }}-${{ matrix.version }}.iso
+          iso_name: build/${{ needs.load_vars.outputs.IMAGE_NAME }}-${{ matrix.version }}.iso
 
       - name: Set status
         if: inputs.pr && always()
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 506c430..37cac4a 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -31,8 +31,18 @@ jobs:
       pr: ${{ inputs.pr }}
       parent_job_name: ${{ inputs.parent_job_name && format('{0} / ', inputs.parent_job_name) }}Build Container
   
-  build_iso:
-    name: Build ISO
+  build_iso_flatpaks:
+    name: Build ISO with Flatpaks
+    needs:
+      - build_container
+    uses: ./.github/workflows/build_iso.yml
+    with:
+      pr: ${{ inputs.pr }}
+      parent_job_name: ${{ inputs.parent_job_name && format('{0} / ', inputs.parent_job_name) }}Build ISO
+      flatpaks_refs_dir: /github/workspace/flatpak_refs
+
+  build_iso_no_flatpaks:
+    name: Build ISO with Flatpaks Refs
     needs:
       - build_container
     uses: ./.github/workflows/build_iso.yml
@@ -43,7 +53,7 @@ jobs:
   test_iso:
     name: Test ISO
     needs:
-      - build_iso
+      - build_iso_flatpaks
     uses: ./.github/workflows/test_iso.yml
     with:
       pr: ${{ inputs.pr }}
diff --git a/action.yml b/action.yml
index 7fe0c85..d110c5c 100644
--- a/action.yml
+++ b/action.yml
@@ -243,27 +243,3 @@ runs:
       with:
         path: /cache/skopeo
         key: ${{ inputs.skopeo_cache_key || env.skopeo_cache_key }}
-          
-
-    - name: Rename ISO file
-      id: rename_iso
-      shell: bash
-      run: |
-        if [[ ! ( "${{ inputs.iso_name }}" =~ \.iso$ ) ]]
-        then
-          iso_name="${{ inputs.iso_name }}.iso"
-        else
-          iso_name="${{ inputs.iso_name }}"
-        fi
-        if [[ "${{ inputs.iso_name }}" =~ ^/ ]]
-        then
-          full_path="${iso_name}"
-        else
-          full_path="${{ github.workspace }}/${iso_name}"
-        fi
-        mv ${{ github.workspace }}/build/deploy.iso ${full_path} || true
-        cd $(dirname ${full_path})
-        iso_fn=$(basename ${iso_name})
-        sha256sum ${iso_fn} > ${iso_fn}-CHECKSUM
-        echo "iso_path=${full_path}" >> $GITHUB_OUTPUT
-        echo "iso_name=${iso_fn}" >> $GITHUB_OUTPUT