From cf1acba5a6d8c0c47c8683aa0facc9ae4f1f0278 Mon Sep 17 00:00:00 2001
From: "Jason N." <33561705+JasonN3@users.noreply.github.com>
Date: Mon, 1 Apr 2024 11:05:37 -0400
Subject: [PATCH] only test flatpaks when installed

---
 .github/workflows/test_deployment.yml | 5 ++++-
 .github/workflows/test_iso.yml        | 7 +++++--
 .github/workflows/tests.yml           | 2 ++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test_deployment.yml b/.github/workflows/test_deployment.yml
index bdbaac2..47e0095 100644
--- a/.github/workflows/test_deployment.yml
+++ b/.github/workflows/test_deployment.yml
@@ -7,6 +7,9 @@ on:
       parent_job_name:
         required: true
         type: string
+      flatpaks_refs_dir:
+        required: false
+        type: string
       suffix:
         required: false
         type: string
@@ -105,7 +108,7 @@ jobs:
             IMAGE_TAG=${{ matrix.version }} \
             VERSION=${{ matrix.version }} \
             VARIANT=${{ needs.load_vars.outputs.VARIANT }} \
-            FLATPAK_REMOTE_REFS_DIR=${{ 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 }}
           kill $QEMU_PID
diff --git a/.github/workflows/test_iso.yml b/.github/workflows/test_iso.yml
index 033b6a4..3916473 100644
--- a/.github/workflows/test_iso.yml
+++ b/.github/workflows/test_iso.yml
@@ -6,7 +6,10 @@ on:
         type: string
       parent_job_name:
         required: true
-        type: string   
+        type: string
+      flatpaks_refs_dir:
+        required: false
+        type: string
       suffix:
         required: false
         type: string   
@@ -86,7 +89,7 @@ jobs:
             IMAGE_TAG=${{ matrix.version }} \
             VERSION=${{ matrix.version }} \
             VARIANT=${{ needs.load_vars.outputs.VARIANT }} \
-            FLATPAK_REMOTE_REFS_DIR=${{ 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=${{ format('{0}-{1}', needs.load_vars.outputs.IMAGE_NAME, matrix.version) }}${{ inputs.suffix && format('-{0}', inputs.suffix || '') }}.iso
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index d7819f1..2c60b48 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -50,6 +50,7 @@ jobs:
     with:
       pr: ${{ inputs.pr }}
       parent_job_name: ${{ inputs.parent_job_name && format('{0} / ', inputs.parent_job_name) }}Test ISO with Flatpaks
+      flatpaks_refs_dir: /github/workspace/flatpak_refs
       suffix: flatpaks
 
   test_deployment_flatpaks:
@@ -60,6 +61,7 @@ jobs:
     with:
       pr: ${{ inputs.pr }}
       parent_job_name: ${{ inputs.parent_job_name && format('{0} / ', inputs.parent_job_name) }}Test Deployment with Flatpaks
+      flatpaks_refs_dir: /github/workspace/flatpak_refs
       suffix: flatpaks
 
   build_iso: