From 6baed8272a8e4d5706a1df1b46a9937b4cf474c2 Mon Sep 17 00:00:00 2001 From: "Jason N." <33561705+JasonN3@users.noreply.github.com> Date: Tue, 2 Apr 2024 21:23:14 -0400 Subject: [PATCH] fixes --- .github/workflows/test_deployment.yml | 1 - .github/workflows/test_repo.yml | 6 +++--- .github/workflows/tests.yml | 6 +++--- action.yml | 1 + 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test_deployment.yml b/.github/workflows/test_deployment.yml index 1cbdb01..38d0436 100644 --- a/.github/workflows/test_deployment.yml +++ b/.github/workflows/test_deployment.yml @@ -104,7 +104,6 @@ jobs: ${{ inputs.flatpaks_refs_dir && format('FLATPAK_REMOTE_REFS_DIR="{0}"', 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 - name: Set status if: inputs.pr && always() diff --git a/.github/workflows/test_repo.yml b/.github/workflows/test_repo.yml index e06a071..4c658e3 100644 --- a/.github/workflows/test_repo.yml +++ b/.github/workflows/test_repo.yml @@ -24,7 +24,7 @@ jobs: - name: Run test run: | - apt-get update - apt-get install -y make - make test/repo/install-deps + sudo apt-get update + sudo apt-get install -y make + sudo make test/repo/install-deps make test/repo \ No newline at end of file diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9021049..b715490 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -73,7 +73,7 @@ jobs: pr: ${{ inputs.pr }} parent_job_name: ${{ inputs.parent_job_name && format('{0} / ', inputs.parent_job_name) }}Build ISO with Flatpak Refs flatpaks_refs: "app/org.mozilla.firefox/x86_64/stable app/org.videolan.VLC/x86_64/stable" - suffix: flatpaks + suffix: flatpaks_refs test_iso_flatpak_refs: name: Test ISO with Flatpak Refs @@ -84,7 +84,7 @@ jobs: pr: ${{ inputs.pr }} parent_job_name: ${{ inputs.parent_job_name && format('{0} / ', inputs.parent_job_name) }}Test ISO with Flatpak Refs flatpaks_refs: "app/org.mozilla.firefox/x86_64/stable app/org.videolan.VLC/x86_64/stable" - suffix: flatpaks + suffix: flatpaks_refs test_deployment_flatpak_refs: name: Test Deployment with Flatpak Refs @@ -95,7 +95,7 @@ jobs: pr: ${{ inputs.pr }} parent_job_name: ${{ inputs.parent_job_name && format('{0} / ', inputs.parent_job_name) }}Test Deployment with Flatpak Refs flatpaks_refs: "app/org.mozilla.firefox/x86_64/stable app/org.videolan.VLC/x86_64/stable" - suffix: flatpaks + suffix: flatpaks_refs build_iso: name: Build ISO diff --git a/action.yml b/action.yml index 77f8156..19bf70b 100644 --- a/action.yml +++ b/action.yml @@ -197,6 +197,7 @@ runs: ARCH="${{ inputs.arch }}" \ DNF_CACHE="/cache/dnf" \ ENROLLMENT_PASSWORD="${{ inputs.enrollment_password }}" \ + EXTRA_BOOT_PARAMS="${{ inputs.extra_boot_params }}" \ 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) || ''}} \