Allow specific installers to have package overrides

This commit is contained in:
Erwan MATHIEU 2024-12-13 11:18:08 +01:00
parent 20b311f12e
commit 0b661203e7
4 changed files with 19 additions and 4 deletions

View File

@ -9,7 +9,7 @@ on:
default: 'cura/[*]@ultimaker/testing' default: 'cura/[*]@ultimaker/testing'
type: string type: string
package_overrides: package_overrides:
description: 'Space-separated List of specific packages to be used' description: 'List of specific packages to be used (space-separated)'
default: '' default: ''
type: string type: string
conan_args: conan_args:

View File

@ -9,8 +9,12 @@ on:
default: 'cura/[*]@ultimaker/testing' default: 'cura/[*]@ultimaker/testing'
required: true required: true
type: string type: string
package_overrides:
description: 'List of specific packages to be used (space-separated)'
default: ''
type: string
conan_args: conan_args:
description: 'Conan args, e.g. --requires' description: 'Conan args'
default: '' default: ''
required: false required: false
type: string type: string
@ -38,6 +42,7 @@ jobs:
uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@main uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@main
with: with:
cura_conan_version: ${{ inputs.cura_conan_version }} cura_conan_version: ${{ inputs.cura_conan_version }}
package_overrides: ${{ inputs.package_overrides }}
conan_args: ${{ inputs.conan_args }} conan_args: ${{ inputs.conan_args }}
enterprise: ${{ inputs.enterprise }} enterprise: ${{ inputs.enterprise }}
staging: ${{ inputs.staging }} staging: ${{ inputs.staging }}

View File

@ -9,8 +9,12 @@ on:
default: 'cura/[*]@ultimaker/testing' default: 'cura/[*]@ultimaker/testing'
required: true required: true
type: string type: string
package_overrides:
description: 'List of specific packages to be used (space-separated)'
default: ''
type: string
conan_args: conan_args:
description: 'Conan args: eq.: --require-override' description: 'Conan args'
default: '' default: ''
required: false required: false
type: string type: string
@ -47,6 +51,7 @@ jobs:
uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@main uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@main
with: with:
cura_conan_version: ${{ inputs.cura_conan_version }} cura_conan_version: ${{ inputs.cura_conan_version }}
package_overrides: ${{ inputs.package_overrides }}
conan_args: ${{ inputs.conan_args }} conan_args: ${{ inputs.conan_args }}
enterprise: ${{ inputs.enterprise }} enterprise: ${{ inputs.enterprise }}
staging: ${{ inputs.staging }} staging: ${{ inputs.staging }}

View File

@ -9,8 +9,12 @@ on:
default: 'cura/[*]@ultimaker/testing' default: 'cura/[*]@ultimaker/testing'
required: true required: true
type: string type: string
package_overrides:
description: 'List of specific packages to be used (space-separated)'
default: ''
type: string
conan_args: conan_args:
description: 'Conan args: eq.: --requires' description: 'Conan args'
default: '' default: ''
required: false required: false
type: string type: string
@ -38,6 +42,7 @@ jobs:
uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@main uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@main
with: with:
cura_conan_version: ${{ inputs.cura_conan_version }} cura_conan_version: ${{ inputs.cura_conan_version }}
package_overrides: ${{ inputs.package_overrides }}
conan_args: ${{ inputs.conan_args }} conan_args: ${{ inputs.conan_args }}
enterprise: ${{ inputs.enterprise }} enterprise: ${{ inputs.enterprise }}
staging: ${{ inputs.staging }} staging: ${{ inputs.staging }}