From 0b661203e76f1c3d41ba6ebf2b5ae90723552e3a Mon Sep 17 00:00:00 2001
From: Erwan MATHIEU <erwan.mathieu@ultimaker.com>
Date: Fri, 13 Dec 2024 11:18:08 +0100
Subject: [PATCH] Allow specific installers to have package overrides

---
 .github/workflows/installers.yml | 2 +-
 .github/workflows/linux.yml      | 7 ++++++-
 .github/workflows/macos.yml      | 7 ++++++-
 .github/workflows/windows.yml    | 7 ++++++-
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml
index 1d9b057f67..d63ed5bd6b 100644
--- a/.github/workflows/installers.yml
+++ b/.github/workflows/installers.yml
@@ -9,7 +9,7 @@ on:
         default: 'cura/[*]@ultimaker/testing'
         type: string
       package_overrides:
-        description: 'Space-separated List of specific packages to be used'
+        description: 'List of specific packages to be used (space-separated)'
         default: ''
         type: string
       conan_args:
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index fc749b13c5..66975ddf15 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -9,8 +9,12 @@ on:
         default: 'cura/[*]@ultimaker/testing'
         required: true
         type: string
+      package_overrides:
+        description: 'List of specific packages to be used (space-separated)'
+        default: ''
+        type: string
       conan_args:
-        description: 'Conan args, e.g. --requires'
+        description: 'Conan args'
         default: ''
         required: false
         type: string
@@ -38,6 +42,7 @@ jobs:
     uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@main
     with:
       cura_conan_version: ${{ inputs.cura_conan_version }}
+      package_overrides: ${{ inputs.package_overrides }}
       conan_args: ${{ inputs.conan_args }}
       enterprise: ${{ inputs.enterprise }}
       staging: ${{ inputs.staging }}
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 2a9afda211..97ea2b25ad 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -9,8 +9,12 @@ on:
         default: 'cura/[*]@ultimaker/testing'
         required: true
         type: string
+      package_overrides:
+        description: 'List of specific packages to be used (space-separated)'
+        default: ''
+        type: string
       conan_args:
-        description: 'Conan args: eq.: --require-override'
+        description: 'Conan args'
         default: ''
         required: false
         type: string
@@ -47,6 +51,7 @@ jobs:
     uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@main
     with:
       cura_conan_version: ${{ inputs.cura_conan_version }}
+      package_overrides: ${{ inputs.package_overrides }}
       conan_args: ${{ inputs.conan_args }}
       enterprise: ${{ inputs.enterprise }}
       staging: ${{ inputs.staging }}
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index f86815d3a9..c17d19fd72 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -9,8 +9,12 @@ on:
         default: 'cura/[*]@ultimaker/testing'
         required: true
         type: string
+      package_overrides:
+        description: 'List of specific packages to be used (space-separated)'
+        default: ''
+        type: string
       conan_args:
-        description: 'Conan args: eq.: --requires'
+        description: 'Conan args'
         default: ''
         required: false
         type: string
@@ -38,6 +42,7 @@ jobs:
     uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@main
     with:
       cura_conan_version: ${{ inputs.cura_conan_version }}
+      package_overrides: ${{ inputs.package_overrides }}
       conan_args: ${{ inputs.conan_args }}
       enterprise: ${{ inputs.enterprise }}
       staging: ${{ inputs.staging }}