mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-08-14 08:05:54 +08:00
Start moving installer code to Conan-v2 for Windows too.
CURA-11622
This commit is contained in:
parent
85644b621e
commit
f02481cd1c
13
.github/workflows/windows.yml
vendored
13
.github/workflows/windows.yml
vendored
@ -10,7 +10,7 @@ on:
|
||||
required: true
|
||||
type: string
|
||||
conan_args:
|
||||
description: 'Conan args: eq.: --require-override'
|
||||
description: 'Conan args: eq.: --requires'
|
||||
default: ''
|
||||
required: false
|
||||
type: string
|
||||
@ -24,13 +24,6 @@ on:
|
||||
default: false
|
||||
required: true
|
||||
type: boolean
|
||||
architecture:
|
||||
description: 'Architecture'
|
||||
required: true
|
||||
default: 'X64'
|
||||
type: choice
|
||||
options:
|
||||
- X64
|
||||
operating_system:
|
||||
description: 'OS'
|
||||
required: true
|
||||
@ -42,12 +35,12 @@ on:
|
||||
|
||||
jobs:
|
||||
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:
|
||||
cura_conan_version: ${{ inputs.cura_conan_version }}
|
||||
conan_args: ${{ inputs.conan_args }}
|
||||
enterprise: ${{ inputs.enterprise }}
|
||||
staging: ${{ inputs.staging }}
|
||||
architecture: ${{ inputs.architecture }}
|
||||
operating_system: ${{ inputs.operating_system }}
|
||||
secrets: inherit
|
||||
|
Loading…
x
Reference in New Issue
Block a user