Specify OS as UI option

Contributes to CURA-8415
This commit is contained in:
Jelle Spijker 2023-08-18 23:54:48 +02:00
parent b681439bba
commit f452bcf576
No known key found for this signature in database
GPG Key ID: 034D1C0527888B65
3 changed files with 42 additions and 6 deletions

View File

@ -31,6 +31,14 @@ on:
type: choice type: choice
options: options:
- X64 - X64
operating_system:
description: 'OS'
required: true
default: 'ubuntu-22.04'
type: choice
options:
- ubuntu-22.04
- ubuntu-20.04
workflow_call: workflow_call:
inputs: inputs:
cura_conan_version: cura_conan_version:
@ -58,6 +66,11 @@ on:
required: true required: true
default: 'X64' default: 'X64'
type: string type: string
operating_system:
description: 'OS'
required: true
default: 'ubuntu-22.04'
type: string
env: env:
CONAN_LOGIN_USERNAME_CURA: ${{ secrets.CONAN_USER }} CONAN_LOGIN_USERNAME_CURA: ${{ secrets.CONAN_USER }}
@ -69,10 +82,7 @@ env:
jobs: jobs:
cura-installer-create: cura-installer-create:
strategy: runs-on: ${{ inputs.operating_system }}
matrix:
os: [ "ubuntu-20.04", "ubuntu-22.04" ]
runs-on: ${{ matrix.os }}
steps: steps:
- name: Checkout - name: Checkout

View File

@ -32,6 +32,15 @@ on:
options: options:
- X64 - X64
- ARM64 - ARM64
operating_system:
description: 'OS'
required: true
default: 'macos-11'
type: choice
options:
- self-hosted
- macos-11
- macos-12
workflow_call: workflow_call:
inputs: inputs:
cura_conan_version: cura_conan_version:
@ -59,6 +68,11 @@ on:
required: true required: true
default: 'X64' default: 'X64'
type: string type: string
operating_system:
description: 'OS'
required: true
default: 'macos-11'
type: string
env: env:
CONAN_LOGIN_USERNAME_CURA: ${{ secrets.CONAN_USER }} CONAN_LOGIN_USERNAME_CURA: ${{ secrets.CONAN_USER }}
@ -76,7 +90,7 @@ env:
jobs: jobs:
cura-installer-create: cura-installer-create:
runs-on: [ self-hosted, "${{ inputs.architecture }}" ] runs-on: ${{ inputs.operating_system }}
steps: steps:
- name: Checkout - name: Checkout

View File

@ -31,6 +31,13 @@ on:
type: choice type: choice
options: options:
- X64 - X64
operating_system:
description: 'OS'
required: true
default: 'windows-2022'
type: choice
options:
- windows-2022
workflow_call: workflow_call:
inputs: inputs:
cura_conan_version: cura_conan_version:
@ -58,6 +65,11 @@ on:
required: true required: true
default: 'X64' default: 'X64'
type: string type: string
operating_system:
description: 'OS'
required: true
default: 'windows-2022'
type: string
env: env:
CONAN_LOGIN_USERNAME_CURA: ${{ secrets.CONAN_USER }} CONAN_LOGIN_USERNAME_CURA: ${{ secrets.CONAN_USER }}
@ -70,7 +82,7 @@ env:
jobs: jobs:
cura-installer-create: cura-installer-create:
runs-on: 'windows-2022' runs-on: ${{ inputs.operating_system }}
steps: steps:
- name: Checkout - name: Checkout