diff --git a/.github/actions/run-patina-qemu-validation/action.yml b/.github/actions/run-patina-qemu-validation/action.yml index 05da555..4213427 100644 --- a/.github/actions/run-patina-qemu-validation/action.yml +++ b/.github/actions/run-patina-qemu-validation/action.yml @@ -41,9 +41,6 @@ inputs: description: Shut down QEMU after running ('true' or 'false'). required: false default: 'false' - toolchain: - description: Rust toolchain tag. - required: true runs: using: composite @@ -62,7 +59,6 @@ runs: PRE_COMPILED_ROM: ${{ inputs.pre-compiled-rom }} QEMU_PATH: ${{ inputs.qemu-path }} SHUTDOWN_AFTER_RUN: ${{ inputs.shutdown-after-run }} - TOOLCHAIN: ${{ inputs.toolchain }} run: | import json, os, subprocess, sys @@ -77,7 +73,6 @@ runs: "pre_compiled_rom": os.environ["PRE_COMPILED_ROM"], "qemu_path": os.environ.get("QEMU_PATH", ""), "shutdown_after_run": os.environ.get("SHUTDOWN_AFTER_RUN", "false").lower() == "true", - "toolchain": os.environ["TOOLCHAIN"], }) script = os.path.join(os.environ["ACTION_PATH"], "run_qemu_validation.py") diff --git a/.github/actions/run-patina-qemu-validation/run_qemu_validation.py b/.github/actions/run-patina-qemu-validation/run_qemu_validation.py index 7740606..59dc404 100644 --- a/.github/actions/run-patina-qemu-validation/run_qemu_validation.py +++ b/.github/actions/run-patina-qemu-validation/run_qemu_validation.py @@ -33,8 +33,6 @@ needed on Windows when QEMU is not on PATH. Default: "". shutdown_after_run (bool, optional) Shut down QEMU after running. Default: false. - toolchain (string, required) Rust toolchain tag (e.g. "GCC5" or - "VS2022"). """ import argparse @@ -188,7 +186,6 @@ def main() -> int: "--patina-dxe-core-repo", config["patina_dxe_core_repo"], "--platform", config["platform"], "--pre-compiled-rom", config["pre_compiled_rom"], - "--toolchain", config["toolchain"], ] if config.get("qemu_path"): diff --git a/.github/workflows/PatinaQemuPrValidation.yml b/.github/workflows/PatinaQemuPrValidation.yml index b303686..d47bda5 100644 --- a/.github/workflows/PatinaQemuPrValidation.yml +++ b/.github/workflows/PatinaQemuPrValidation.yml @@ -574,7 +574,6 @@ jobs: platform: ${{ matrix.platform }} pre-compiled-rom: ${{ env.FW_DIR }}/${{ matrix.rom_subpath }} shutdown-after-run: 'true' - toolchain: ${{ needs.vars.outputs['linux-toolchain'] }} - name: Upload QEMU Linux ${{ matrix.platform }} Logs if: always() @@ -754,7 +753,6 @@ jobs: pre-compiled-rom: ${{ env.FW_DIR }}/Q35/DEBUG-VS2022/QEMUQ35_CODE.fd qemu-path: ${{ steps.qemu-path.outputs.qemu_exec }} shutdown-after-run: 'true' - toolchain: ${{ needs.vars.outputs['windows-toolchain'] }} - name: Upload QEMU Windows Logs if: always()