From c8f393f78580247ac44ab5612f4d5c7c67d46d92 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Fri, 18 Aug 2023 08:22:27 +0200 Subject: [PATCH] Specify runner for each installer workflow Contributes to CURA-10855 --- .github/workflows/cura-all-installers.yml | 6 ++++++ .github/workflows/cura-installer.yml | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cura-all-installers.yml b/.github/workflows/cura-all-installers.yml index 4729c4198a..96071756fe 100644 --- a/.github/workflows/cura-all-installers.yml +++ b/.github/workflows/cura-all-installers.yml @@ -64,6 +64,7 @@ jobs: if: ${{ inputs.build_windows_exe }} uses: ./.github/workflows/cura-installer.yml with: + runner: 'windows-2022' platform: 'windows-2022' os_name: 'win64' cura_conan_version: ${{ inputs.cura_conan_version }} @@ -79,6 +80,7 @@ jobs: if: ${{ inputs.build_windows_msi }} uses: ./.github/workflows/cura-installer.yml with: + runner: 'windows-2022' platform: 'windows-2022' os_name: 'win64' cura_conan_version: ${{ inputs.cura_conan_version }} @@ -94,6 +96,7 @@ jobs: if: ${{ inputs.build_linux }} uses: ./.github/workflows/cura-installer.yml with: + runner: 'ubuntu-20.04' platform: 'ubuntu-20.04' os_name: 'linux' cura_conan_version: ${{ inputs.cura_conan_version }} @@ -109,6 +112,7 @@ jobs: if: ${{ inputs.build_linux }} uses: ./.github/workflows/cura-installer.yml with: + runner: 'ubuntu-22.04' platform: 'ubuntu-22.04' os_name: 'linux-modern' cura_conan_version: ${{ inputs.cura_conan_version }} @@ -124,6 +128,7 @@ jobs: if: ${{ inputs.build_macos }} uses: ./.github/workflows/cura-installer.yml with: + runner: 'self-hosted' platform: 'macos-11' os_name: 'mac' cura_conan_version: ${{ inputs.cura_conan_version }} @@ -139,6 +144,7 @@ jobs: if: ${{ inputs.build_macos }} uses: ./.github/workflows/cura-installer.yml with: + runner: 'self-hosted' platform: 'macos-11' os_name: 'mac' cura_conan_version: ${{ inputs.cura_conan_version }} diff --git a/.github/workflows/cura-installer.yml b/.github/workflows/cura-installer.yml index 9572b31aee..ea71fc83dc 100644 --- a/.github/workflows/cura-installer.yml +++ b/.github/workflows/cura-installer.yml @@ -4,6 +4,11 @@ run-name: ${{ inputs.cura_conan_version }} for ${{ inputs.platform }} by @${{ gi on: workflow_call: inputs: + runner: + description: 'Selected runner' + default: 'ubuntu-20.04' + required: true + type: string platform: description: 'Selected Installer OS' default: 'ubuntu-20.04' @@ -74,7 +79,7 @@ env: jobs: cura-installer-create: - runs-on: ${{ inputs.platform }} + runs-on: ${{ inputs.runner }} steps: - name: Checkout