Allow specific installers to have package overrides

Ultimaker · Dec 13, 2024 · 0b66120 · 0b66120
1 parent 20b311f
commit 0b66120
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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 }}