GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-16 17:25:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Start moving installer code to Conan-v2 for Windows too.

Browse Source 
CURA-11622
This commit is contained in:
Remco Burema 2024-11-13 16:39:57 +01:00
parent 85644b621e
commit f02481cd1c
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.github/workflows/windows.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: eq.: --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
@ -42,12 +35,12 @@ on:
jobs: jobs:
windows-installer: windows-installer:
uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@main # FIXME: Use main once merged
uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.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