GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 10:35:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use uptodate linux installer workflow

Browse Source
This commit is contained in:
Erwan MATHIEU 2024-09-26 11:16:35 +02:00
parent 906e4e6c42
commit 961862bb2b
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/installers.yml vendored
View File

@ -10,7 +10,7 @@ on:
required: true required: true
type: string type: string
conan_args: conan_args:
description: 'Conan args: eq.: --require-override' description: 'Conan args, e.g. --requires'
default: '' default: ''
required: false required: false
type: string type: string
@ -84,15 +84,15 @@ jobs:
operating_system: self-hosted-Windows-X64 operating_system: self-hosted-Windows-X64
secrets: inherit secrets: inherit
# FIXME: Use main once merged
linux-installer: linux-installer:
uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@main uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@CURA-11622_conan_v2
needs: [ default_values ] needs: [ default_values ]
with: with:
cura_conan_version: ${{ needs.default_values.outputs.cura_conan_version }} cura_conan_version: ${{ needs.default_values.outputs.cura_conan_version }}
conan_args: ${{ github.event.inputs.conan_args }} conan_args: ${{ github.event.inputs.conan_args }}
enterprise: ${{ github.event.inputs.enterprise == 'true' }} enterprise: ${{ github.event.inputs.enterprise == 'true' }}
staging: ${{ github.event.inputs.staging == 'true' }} staging: ${{ github.event.inputs.staging == 'true' }}
architecture: X64
operating_system: self-hosted-Ubuntu22-X64 operating_system: self-hosted-Ubuntu22-X64
secrets: inherit secrets: inherit

13
.github/workflows/linux.yml vendored
View File

@ -10,7 +10,7 @@ on:
required: true required: true
type: string type: string
conan_args: conan_args:
description: 'Conan args: eq.: --require-override' description: 'Conan args, e.g. --requires'
default: '' default: ''
required: false required: false
type: string type: string
@ -24,13 +24,6 @@ on:
default: false default: false
required: true required: true
type: boolean type: boolean
architecture:
description: 'Architecture'
required: true
default: 'X64'
type: choice
options:
- X64
operating_system: operating_system:
description: 'OS' description: 'OS'
required: true required: true
@ -41,13 +34,13 @@ on:
- self-hosted-Ubuntu22-X64 - self-hosted-Ubuntu22-X64
jobs: jobs:
# FIXME: Use main once merged
linux-installer: linux-installer:
uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@main uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@CURA-11622_conan_v2
with: with:
cura_conan_version: ${{ inputs.cura_conan_version }} cura_conan_version: ${{ inputs.cura_conan_version }}
conan_args: ${{ inputs.conan_args }} conan_args: ${{ inputs.conan_args }}
enterprise: ${{ inputs.enterprise }} enterprise: ${{ inputs.enterprise }}
staging: ${{ inputs.staging }} staging: ${{ inputs.staging }}
architecture: ${{ inputs.architecture }}
operating_system: ${{ inputs.operating_system }} operating_system: ${{ inputs.operating_system }}
secrets: inherit secrets: inherit