diff --git a/.github/workflows/Parameters.yml b/.github/workflows/Parameters.yml index 8c6a6ed..9d00d84 100644 --- a/.github/workflows/Parameters.yml +++ b/.github/workflows/Parameters.yml @@ -59,6 +59,26 @@ on: required: false default: '' type: string + ubuntu_image: + description: 'The used GitHub Action image for Ubuntu based jobs.' + required: false + default: 'ubuntu-24.04' + type: string + windows_image: + description: 'The used GitHub Action image for Windows based jobs.' + required: false + default: 'windows-latest' + type: string + macos_intel_image: + description: 'The used GitHub Action image for macOS (Intel x86-64) based jobs.' + required: false + default: 'macos-latest-large' + type: string + macos_arm_image: + description: 'The used GitHub Action image for macOS (ARM arm64) based jobs.' + required: false + default: 'macos-latest' + type: string outputs: python_version: @@ -157,9 +177,10 @@ jobs: }, # Runner systems (runner images) supported by GitHub Actions "sys": { - "ubuntu": { "icon": "🐧", "runs-on": "ubuntu-24.04", "shell": "bash", "name": "Linux (x86-64)" }, - "windows": { "icon": "🪟", "runs-on": "windows-latest", "shell": "pwsh", "name": "Windows (x86-64)" }, - "macos": { "icon": "🍎", "runs-on": "macos-latest", "shell": "bash", "name": "MacOS (x86-64)" }, + "ubuntu": { "icon": "🐧", "runs-on": "${{ inputs.ubuntu_image }}", "shell": "bash", "name": "Linux (x86-64)" }, + "windows": { "icon": "🪟", "runs-on": "${{ inputs.windows_image }}", "shell": "pwsh", "name": "Windows (x86-64)" }, + "macos": { "icon": "🍎", "runs-on": "${{ inputs.macos_intel_image }}", "shell": "bash", "name": "macOS (x86-64)" }, + "macos-arm": { "icon": "🍏", "runs-on": "${{ inputs.macos_arm_image }}", "shell": "bash", "name": "macOS (arm64)" }, }, # Runtimes provided by MSYS2 "runtime": { diff --git a/.gitignore b/.gitignore index 7ab3de6..aa068cd 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ coverage.xml # pytest /report/unit +/tests/*.github # setuptools /build/**/*.* diff --git a/tests/pacman_packages.py b/tests/pacman_packages.py index 12e3021..6d91871 100644 --- a/tests/pacman_packages.py +++ b/tests/pacman_packages.py @@ -78,10 +78,10 @@ for dependency in dependencies: pacboyPackages.add(rewrite) # Write jobs to special file -# github_output = Path(getenv("GITHUB_OUTPUT")) -# print(f"GITHUB_OUTPUT: {github_output}") -# with github_output.open("a+") as f: -# f.write(f"pacboy_packages={' '.join(pacboyPackages)}\n") +github_output = Path(getenv("GITHUB_OUTPUT")) +print(f"GITHUB_OUTPUT: {github_output}") +with github_output.open("a+") as f: + f.write(f"pacboy_packages={' '.join(pacboyPackages)}\n") print(f"GITHUB_OUTPUT:") print(f"pacboy_packages={' '.join(pacboyPackages)}\n") diff --git a/tests/python_jobs.py b/tests/python_jobs.py index 526a7f7..ac8e2c7 100644 --- a/tests/python_jobs.py +++ b/tests/python_jobs.py @@ -67,9 +67,10 @@ data = { }, # Runner systems (runner images) supported by GitHub Actions "sys": { - "ubuntu": {"icon": "🐧", "runs-on": "ubuntu-24.04", "shell": "bash", "name": "Linux (x86-64)"}, + "ubuntu": {"icon": "🐧", "runs-on": "ubuntu-2024.04", "shell": "bash", "name": "Linux (x86-64)"}, "windows": {"icon": "🪟", "runs-on": "windows-latest", "shell": "pwsh", "name": "Windows (x86-64)"}, - "macos": {"icon": "🍎", "runs-on": "macos-latest", "shell": "bash", "name": "MacOS (x86-64)"}, + "macos": {"icon": "🍎", "runs-on": "macos-latest-large", "shell": "bash", "name": "macOS (x86-64)"}, + "macos-arm": {"icon": "🍏", "runs-on": "macos-latest", "shell": "bash", "name": "macOS (arm64)"}, }, # Runtimes provided by MSYS2 "runtime": {