From 63a9b8cd689b699e4d83c321d38d63d51431771b Mon Sep 17 00:00:00 2001 From: "Jason N." <33561705+JasonN3@users.noreply.github.com> Date: Wed, 20 Mar 2024 12:27:04 -0400 Subject: [PATCH] better check --- .github/workflows/build_iso.yml | 6 +++--- action.yml | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_iso.yml b/.github/workflows/build_iso.yml index 1ed5db6..0312a88 100644 --- a/.github/workflows/build_iso.yml +++ b/.github/workflows/build_iso.yml @@ -132,12 +132,12 @@ jobs: image_tag: ${{ matrix.image_tag || matrix.version }} version: ${{ matrix.version }} variant: ${{ needs.load_vars.outputs.VARIANT }} - flatpak_remote_refs_dir: ${{ matrix.rhel && '' || format('/github/workspace/{0}', needs.load_vars.outputs.FLATPAK_REMOTE_REFS_DIR ) }} + flatpak_remote_refs_dir: ${{ matrix.rhel == true && '' || format('/github/workspace/{0}', needs.load_vars.outputs.FLATPAK_REMOTE_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 - secrets_dir: ${{ matrix.rhel && format('{0}/ubi', github.workspace) || '' }} - repos: ${{ matrix.rhel && '/etc/yum.repos.d/redhat.repo' || '/etc/yum.repos.d/fedora.repo /etc/yum.repos.d/fedora-updates.repo' }} + secrets_dir: ${{ matrix.rhel == true && format('{0}/ubi', github.workspace) || '' }} + repos: ${{ matrix.rhel == true && '/etc/yum.repos.d/redhat.repo' || '/etc/yum.repos.d/fedora.repo /etc/yum.repos.d/fedora-updates.repo' }} - name: Save output id: save_output diff --git a/action.yml b/action.yml index b4f2855..f38b4df 100644 --- a/action.yml +++ b/action.yml @@ -174,8 +174,10 @@ runs: if [[ -n "${{ inputs.flatpak_remote_refs }}" ]] then vars="${vars} FLATPAK_REMOTE_REFS=\"${{ inputs.flatpak_remote_refs }}\"" - else + elif [[ -n "${{ inputs.flatpak_remote_refs_dir }}" ]] + then vars="${vars} FLATPAK_REMOTE_REFS_DIR=\"${{ inputs.flatpak_remote_refs_dir }}\"" + else fi fi if [[ -n "${{ inputs.secrets_dir }}" ]]