GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-11 09:19:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

IDK

Browse Source
This commit is contained in:
Jelle Spijker 2023-01-06 14:47:56 +01:00
parent 0d5f482e15
commit 53a9f43e5c
2 changed files with 15 additions and 7 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,6 +72,7 @@ jobs:
enterprise: ${{ inputs.enterprise }} enterprise: ${{ inputs.enterprise }}
staging: ${{ inputs.staging }} staging: ${{ inputs.staging }}
installer: ${{ inputs.installer }} installer: ${{ inputs.installer }}
msi_installer: false
secrets: inherit secrets: inherit
windows-installer-create-msi: windows-installer-create-msi:
@ -86,7 +87,7 @@ jobs:
enterprise: ${{ inputs.enterprise }} enterprise: ${{ inputs.enterprise }}
staging: ${{ inputs.staging }} staging: ${{ inputs.staging }}
installer: ${{ inputs.installer }} installer: ${{ inputs.installer }}
msi: true msi_installer: true
secrets: inherit secrets: inherit
linux-installer-create: linux-installer-create:
@ -101,6 +102,7 @@ jobs:
enterprise: ${{ inputs.enterprise }} enterprise: ${{ inputs.enterprise }}
staging: ${{ inputs.staging }} staging: ${{ inputs.staging }}
installer: ${{ inputs.installer }} installer: ${{ inputs.installer }}
msi_installer: false
secrets: inherit secrets: inherit
linux-modern-installer-create: linux-modern-installer-create:
@ -115,6 +117,7 @@ jobs:
enterprise: ${{ inputs.enterprise }} enterprise: ${{ inputs.enterprise }}
staging: ${{ inputs.staging }} staging: ${{ inputs.staging }}
installer: ${{ inputs.installer }} installer: ${{ inputs.installer }}
msi_installer: false
secrets: inherit secrets: inherit
macos-installer-create: macos-installer-create:
@ -129,4 +132,5 @@ jobs:
enterprise: ${{ inputs.enterprise }} enterprise: ${{ inputs.enterprise }}
staging: ${{ inputs.staging }} staging: ${{ inputs.staging }}
installer: ${{ inputs.installer }} installer: ${{ inputs.installer }}
msi_installer: false
secrets: inherit secrets: inherit

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

@ -44,10 +44,10 @@ on:
default: true default: true
required: true required: true
type: boolean type: boolean
msi: msi_installer:
description: 'Create the msi' description: 'Create the msi'
default: false default: false
required: false required: true
type: boolean type: boolean
env: env:
@ -80,6 +80,10 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: blerk
if: ${{ runner.os == 'Windows' }}
run: echo ${{ github.event.inputs.msi_installer }}
- name: Setup Python and pip - name: Setup Python and pip
uses: actions/setup-python@v4 uses: actions/setup-python@v4
with: with:
@ -240,19 +244,19 @@ jobs:
working-directory: dist working-directory: dist
- name: Create the Windows exe installer (Powershell) - name: Create the Windows exe installer (Powershell)
if: ${{ github.event.inputs.installer == 'true' && runner.os == 'Windows' && github.event.inputs.msi == 'false' }} if: ${{ github.event.inputs.installer == 'true' && runner.os == 'Windows' && github.event.inputs.msi_installer == 'false' }}
run: | run: |
python ..\cura_inst\packaging\NSIS\create_windows_installer.py ../cura_inst . "UltiMaker-Cura-$Env:CURA_VERSION_FULL-${{ inputs.os_name }}.exe" python ..\cura_inst\packaging\NSIS\create_windows_installer.py ../cura_inst . "UltiMaker-Cura-$Env:CURA_VERSION_FULL-${{ inputs.os_name }}.exe"
working-directory: dist working-directory: dist
- name: Create the Windows msi installer (Powershell) - name: Create the Windows msi installer (Powershell)
if: ${{ github.event.inputs.installer == 'true' && runner.os == 'Windows' && github.event.inputs.msi == 'true' }} if: ${{ github.event.inputs.installer == 'true' && runner.os == 'Windows' && github.event.inputs.msi_installer == 'true' }}
run: | run: |
python ..\cura_inst\packaging\msi\create_windows_msi.py ..\cura_inst .\UltiMaker-Cura "UltiMaker-Cura-$Env:CURA_VERSION_FULL-${{ inputs.os_name }}.msi" "$Env:CURA_APP_NAME" python ..\cura_inst\packaging\msi\create_windows_msi.py ..\cura_inst .\UltiMaker-Cura "UltiMaker-Cura-$Env:CURA_VERSION_FULL-${{ inputs.os_name }}.msi" "$Env:CURA_APP_NAME"
working-directory: dist working-directory: dist
- name: Sign the Windows exe installer (Powershell) - name: Sign the Windows exe installer (Powershell)
if: ${{ github.event.inputs.installer == 'true' && runner.os == 'Windows' &&github.event.inputs.msi == 'false' }} if: ${{ github.event.inputs.installer == 'true' && runner.os == 'Windows' && github.event.inputs.msi_installer == 'false' }}
env: env:
PFX_PATH: ${{ steps.create-pfx.outputs.PFX_PATH }} PFX_PATH: ${{ steps.create-pfx.outputs.PFX_PATH }}
run: | run: |
@ -260,7 +264,7 @@ jobs:
working-directory: dist working-directory: dist
- name: Sign the Windows msi installer (Powershell) - name: Sign the Windows msi installer (Powershell)
if: ${{ github.event.inputs.installer == 'true' && runner.os == 'Windows' && github.event.inputs.msi == 'true' }} if: ${{ github.event.inputs.installer == 'true' && runner.os == 'Windows' && github.event.inputs.msi_installer == 'true' }}
env: env:
PFX_PATH: ${{ steps.create-pfx.outputs.PFX_PATH }} PFX_PATH: ${{ steps.create-pfx.outputs.PFX_PATH }}
run: | run: |