From f452bcf5766519a42d791346f234f9a96ca304c5 Mon Sep 17 00:00:00 2001
From: Jelle Spijker <jelle.spijker@ultimaker.com>
Date: Fri, 18 Aug 2023 23:54:48 +0200
Subject: [PATCH] Specify OS as UI option

Contributes to CURA-8415
---
 .github/workflows/linux.yml   | 18 ++++++++++++++----
 .github/workflows/macos.yml   | 16 +++++++++++++++-
 .github/workflows/windows.yml | 14 +++++++++++++-
 3 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 7940a8126b..e307354c0a 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -31,6 +31,14 @@ on:
                 type: choice
                 options:
                     - X64
+            operating_system:
+                description: 'OS'
+                required: true
+                default: 'ubuntu-22.04'
+                type: choice
+                options:
+                    - ubuntu-22.04
+                    - ubuntu-20.04
     workflow_call:
         inputs:
             cura_conan_version:
@@ -58,6 +66,11 @@ on:
                 required: true
                 default: 'X64'
                 type: string
+            operating_system:
+                description: 'OS'
+                required: true
+                default: 'ubuntu-22.04'
+                type: string
 
 env:
     CONAN_LOGIN_USERNAME_CURA: ${{ secrets.CONAN_USER }}
@@ -69,10 +82,7 @@ env:
 
 jobs:
     cura-installer-create:
-        strategy:
-            matrix:
-                os: [ "ubuntu-20.04", "ubuntu-22.04" ]
-        runs-on: ${{ matrix.os }}
+        runs-on: ${{ inputs.operating_system }}
 
         steps:
             -   name: Checkout
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index bc59eb27c1..1a9b8809e3 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -32,6 +32,15 @@ on:
                 options:
                     - X64
                     - ARM64
+            operating_system:
+                description: 'OS'
+                required: true
+                default: 'macos-11'
+                type: choice
+                options:
+                    - self-hosted
+                    - macos-11
+                    - macos-12
     workflow_call:
         inputs:
             cura_conan_version:
@@ -59,6 +68,11 @@ on:
                 required: true
                 default: 'X64'
                 type: string
+            operating_system:
+                description: 'OS'
+                required: true
+                default: 'macos-11'
+                type: string
 
 env:
     CONAN_LOGIN_USERNAME_CURA: ${{ secrets.CONAN_USER }}
@@ -76,7 +90,7 @@ env:
 
 jobs:
     cura-installer-create:
-        runs-on: [ self-hosted, "${{ inputs.architecture }}" ]
+        runs-on: ${{ inputs.operating_system }}
 
         steps:
             -   name: Checkout
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 1fb38e352d..d76a44d917 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -31,6 +31,13 @@ on:
                 type: choice
                 options:
                     - X64
+            operating_system:
+                description: 'OS'
+                required: true
+                default: 'windows-2022'
+                type: choice
+                options:
+                    - windows-2022
     workflow_call:
         inputs:
             cura_conan_version:
@@ -58,6 +65,11 @@ on:
                 required: true
                 default: 'X64'
                 type: string
+            operating_system:
+                description: 'OS'
+                required: true
+                default: 'windows-2022'
+                type: string
 
 env:
     CONAN_LOGIN_USERNAME_CURA: ${{ secrets.CONAN_USER }}
@@ -70,7 +82,7 @@ env:
 
 jobs:
     cura-installer-create:
-        runs-on: 'windows-2022'
+        runs-on: ${{ inputs.operating_system }}
 
         steps:
             -   name: Checkout