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

Merge branch 'main' into CURA-9522

Browse Source 
# Conflicts:
#	.github/workflows/cura-all-installers.yml
This commit is contained in:
c.lamboo 2023-01-06 14:31:37 +01:00
commit 12f2246f1c
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/cura-all-installers.yml vendored
View File

@ -72,7 +72,6 @@ jobs:
enterprise: ${{ inputs.enterprise }} enterprise: ${{ inputs.enterprise }}
staging: ${{ inputs.staging }} staging: ${{ inputs.staging }}
installer: ${{ inputs.installer }} installer: ${{ inputs.installer }}
msi: 'false'
secrets: inherit secrets: inherit
windows-installer-create-msi: windows-installer-create-msi:
@ -87,7 +86,7 @@ jobs:
enterprise: ${{ inputs.enterprise }} enterprise: ${{ inputs.enterprise }}
staging: ${{ inputs.staging }} staging: ${{ inputs.staging }}
installer: ${{ inputs.installer }} installer: ${{ inputs.installer }}
msi: 'true' msi: true
secrets: inherit secrets: inherit
linux-installer-create: linux-installer-create:
@ -102,7 +101,6 @@ jobs:
enterprise: ${{ inputs.enterprise }} enterprise: ${{ inputs.enterprise }}
staging: ${{ inputs.staging }} staging: ${{ inputs.staging }}
installer: ${{ inputs.installer }} installer: ${{ inputs.installer }}
msi: 'false'
secrets: inherit secrets: inherit
linux-modern-installer-create: linux-modern-installer-create:
@ -117,7 +115,6 @@ jobs:
enterprise: ${{ inputs.enterprise }} enterprise: ${{ inputs.enterprise }}
staging: ${{ inputs.staging }} staging: ${{ inputs.staging }}
installer: ${{ inputs.installer }} installer: ${{ inputs.installer }}
msi: 'false'
secrets: inherit secrets: inherit
macos-installer-create: macos-installer-create:
@ -132,5 +129,4 @@ jobs:
enterprise: ${{ inputs.enterprise }} enterprise: ${{ inputs.enterprise }}
staging: ${{ inputs.staging }} staging: ${{ inputs.staging }}
installer: ${{ inputs.installer }} installer: ${{ inputs.installer }}
msi: 'false'
secrets: inherit secrets: inherit

6
.github/workflows/cura-installer.yml vendored
View File

@ -46,9 +46,9 @@ on:
type: boolean type: boolean
msi: msi:
description: 'Create the msi' description: 'Create the msi'
default: 'false' default: false
required: true required: false
type: string type: boolean
env: env:
CONAN_LOGIN_USERNAME_CURA: ${{ secrets.CONAN_USER }} CONAN_LOGIN_USERNAME_CURA: ${{ secrets.CONAN_USER }}