GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 14:09:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Specify runner for each installer workflow

Browse Source 
Contributes to CURA-10855
This commit is contained in:
Jelle Spijker 2023-08-18 08:22:27 +02:00
parent 0432b76b4e
commit c8f393f785
No known key found for this signature in database
GPG Key ID: 034D1C0527888B65
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/cura-all-installers.yml vendored
View File

@ -64,6 +64,7 @@ jobs:
if: ${{ inputs.build_windows_exe }} if: ${{ inputs.build_windows_exe }}
uses: ./.github/workflows/cura-installer.yml uses: ./.github/workflows/cura-installer.yml
with: with:
runner: 'windows-2022'
platform: 'windows-2022' platform: 'windows-2022'
os_name: 'win64' os_name: 'win64'
cura_conan_version: ${{ inputs.cura_conan_version }} cura_conan_version: ${{ inputs.cura_conan_version }}
@ -79,6 +80,7 @@ jobs:
if: ${{ inputs.build_windows_msi }} if: ${{ inputs.build_windows_msi }}
uses: ./.github/workflows/cura-installer.yml uses: ./.github/workflows/cura-installer.yml
with: with:
runner: 'windows-2022'
platform: 'windows-2022' platform: 'windows-2022'
os_name: 'win64' os_name: 'win64'
cura_conan_version: ${{ inputs.cura_conan_version }} cura_conan_version: ${{ inputs.cura_conan_version }}
@ -94,6 +96,7 @@ jobs:
if: ${{ inputs.build_linux }} if: ${{ inputs.build_linux }}
uses: ./.github/workflows/cura-installer.yml uses: ./.github/workflows/cura-installer.yml
with: with:
runner: 'ubuntu-20.04'
platform: 'ubuntu-20.04' platform: 'ubuntu-20.04'
os_name: 'linux' os_name: 'linux'
cura_conan_version: ${{ inputs.cura_conan_version }} cura_conan_version: ${{ inputs.cura_conan_version }}
@ -109,6 +112,7 @@ jobs:
if: ${{ inputs.build_linux }} if: ${{ inputs.build_linux }}
uses: ./.github/workflows/cura-installer.yml uses: ./.github/workflows/cura-installer.yml
with: with:
runner: 'ubuntu-22.04'
platform: 'ubuntu-22.04' platform: 'ubuntu-22.04'
os_name: 'linux-modern' os_name: 'linux-modern'
cura_conan_version: ${{ inputs.cura_conan_version }} cura_conan_version: ${{ inputs.cura_conan_version }}
@ -124,6 +128,7 @@ jobs:
if: ${{ inputs.build_macos }} if: ${{ inputs.build_macos }}
uses: ./.github/workflows/cura-installer.yml uses: ./.github/workflows/cura-installer.yml
with: with:
runner: 'self-hosted'
platform: 'macos-11' platform: 'macos-11'
os_name: 'mac' os_name: 'mac'
cura_conan_version: ${{ inputs.cura_conan_version }} cura_conan_version: ${{ inputs.cura_conan_version }}
@ -139,6 +144,7 @@ jobs:
if: ${{ inputs.build_macos }} if: ${{ inputs.build_macos }}
uses: ./.github/workflows/cura-installer.yml uses: ./.github/workflows/cura-installer.yml
with: with:
runner: 'self-hosted'
platform: 'macos-11' platform: 'macos-11'
os_name: 'mac' os_name: 'mac'
cura_conan_version: ${{ inputs.cura_conan_version }} cura_conan_version: ${{ inputs.cura_conan_version }}

7
.github/workflows/cura-installer.yml vendored
View File

@ -4,6 +4,11 @@ run-name: ${{ inputs.cura_conan_version }} for ${{ inputs.platform }} by @${{ gi
on: on:
workflow_call: workflow_call:
inputs: inputs:
runner:
description: 'Selected runner'
default: 'ubuntu-20.04'
required: true
type: string
platform: platform:
description: 'Selected Installer OS' description: 'Selected Installer OS'
default: 'ubuntu-20.04' default: 'ubuntu-20.04'
@ -74,7 +79,7 @@ env:
jobs: jobs:
cura-installer-create: cura-installer-create:
runs-on: ${{ inputs.platform }} runs-on: ${{ inputs.runner }}
steps: steps:
- name: Checkout - name: Checkout