Skip to content

Commit 34a542a

Browse files
authored
Merge pull request #21109 from Ultimaker/update_build_from_ticket_workflow
Add package override inputs to workflow
2 parents 4e31f24 + 3d830b8 commit 34a542a

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

.github/workflows/find-packages.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,14 @@ on:
1313
default: true
1414
required: false
1515
type: boolean
16+
cura_conan_version:
17+
description: 'Cura Conan Version (optional, overrides discovered packages)'
18+
default: ''
19+
type: string
20+
package_overrides:
21+
description: 'List of specific packages to be used (space-separated, in addition to discovered packages)'
22+
default: ''
23+
type: string
1624
conan_args:
1725
description: 'Conan args'
1826
default: ''
@@ -43,8 +51,8 @@ jobs:
4351
if: ${{ inputs.start_builds == true && needs.find-packages.outputs.discovered_packages != '' }}
4452
uses: ultimaker/cura-workflows/.github/workflows/cura-installers.yml@main
4553
with:
46-
cura_conan_version: ${{ needs.find-packages.outputs.cura_package }}
47-
package_overrides: ${{ needs.find-packages.outputs.package_overrides }}
54+
cura_conan_version: ${{ inputs.cura_conan_version != '' && inputs.cura_conan_version || needs.find-packages.outputs.cura_package }}
55+
package_overrides: ${{ format('{0}, {1}', needs.find-packages.outputs.package_overrides, inputs.package_overrides) }}
4856
conan_args: ${{ inputs.conan_args }}
4957
enterprise: ${{ inputs.enterprise }}
5058
staging: ${{ inputs.staging }}

0 commit comments

Comments
 (0)