From 02c3b10f56e49821f70f8eca700b99570e0991ac Mon Sep 17 00:00:00 2001 From: Jason N <33561705+JasonN3@users.noreply.github.com> Date: Tue, 9 Apr 2024 10:53:10 -0400 Subject: [PATCH] Fix dependencies path and issues with secure boot key (#100) Co-authored-by: Noel Miller --- .github/workflows/build_container.yml | 1 + .github/workflows/build_iso.yml | 1 + .github/workflows/test_deployment.yml | 1 + .github/workflows/test_iso.yml | 1 + action.yml | 2 +- xorriso/gen_input.sh | 4 ++-- 6 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_container.yml b/.github/workflows/build_container.yml index 00c8e5e2..705485ad 100644 --- a/.github/workflows/build_container.yml +++ b/.github/workflows/build_container.yml @@ -50,6 +50,7 @@ jobs: with: github_token: ${{ secrets.GITHUB_TOKEN }} job_name: "${{ inputs.parent_job_name }} / ${{ env.JOB_NAME }}" + per_page: 100 - name: Set status if: inputs.pr && always() diff --git a/.github/workflows/build_iso.yml b/.github/workflows/build_iso.yml index c55870b1..54e309f4 100644 --- a/.github/workflows/build_iso.yml +++ b/.github/workflows/build_iso.yml @@ -64,6 +64,7 @@ jobs: with: github_token: ${{ secrets.GITHUB_TOKEN }} job_name: "${{ inputs.parent_job_name }} / ${{ env.JOB_NAME }} (${{ matrix.version }})" + per_page: 100 - name: Set status if: inputs.pr && always() diff --git a/.github/workflows/test_deployment.yml b/.github/workflows/test_deployment.yml index d2e82599..da2a2b20 100644 --- a/.github/workflows/test_deployment.yml +++ b/.github/workflows/test_deployment.yml @@ -63,6 +63,7 @@ jobs: with: github_token: ${{ secrets.GITHUB_TOKEN }} job_name: "${{ inputs.parent_job_name }} / ${{ env.JOB_NAME }} (${{ matrix.version }})" + per_page: 100 - name: Set status if: inputs.pr && always() diff --git a/.github/workflows/test_iso.yml b/.github/workflows/test_iso.yml index c4f0bec0..b78c2a50 100644 --- a/.github/workflows/test_iso.yml +++ b/.github/workflows/test_iso.yml @@ -63,6 +63,7 @@ jobs: with: github_token: ${{ secrets.GITHUB_TOKEN }} job_name: "${{ inputs.parent_job_name }} / ${{ env.JOB_NAME }} (${{ matrix.version }})" + per_page: 100 - name: Set status if: inputs.pr && always() diff --git a/action.yml b/action.yml index 7c200729..2df46595 100644 --- a/action.yml +++ b/action.yml @@ -150,7 +150,7 @@ runs: make flatpaks/repo \ FLATPAK_REMOTE_NAME="${{ inputs.flatpak_remote_name }}" \ ${{ inputs.flatpak_remote_refs && format('FLATPAK_REMOTE_REFS="{0}"', inputs.flatpak_remote_refs) || ''}} \ - ${{ inputs.flatpak_remote_refs_dir && format('FLATPAK_REMOTE_REFS_DIR="{0}"', inputs.flatpak_remote_refs_dir) || ''}} \ + ${{ inputs.flatpak_remote_refs_dir && format('FLATPAK_REMOTE_REFS_DIR="{0}/{1}"', github.workspace, inputs.flatpak_remote_refs_dir) || ''}} \ FLATPAK_REMOTE_URL="${{ inputs.flatpak_remote_url }}" \ IMAGE_NAME="${{ inputs.image_name }}" \ IMAGE_REPO="${{ inputs.image_repo }}" \ diff --git a/xorriso/gen_input.sh b/xorriso/gen_input.sh index ef27010b..a0f3a489 100644 --- a/xorriso/gen_input.sh +++ b/xorriso/gen_input.sh @@ -34,9 +34,9 @@ then popd > /dev/null fi -if [ -f $(pwd)/sb_pubkey.der ] +if [ -f "${PWD}/../sb_pubkey.der" ] then - echo "-map $(pwd)/../sb_pubkey.der sb_pubkey.der" + echo "-map ${PWD}/../sb_pubkey.der sb_pubkey.der" echo "-chmod 0444 /sb_pubkey.der" fi