3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 13:34:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge branch '5.1'

Browse source 
Conflicts:
	conandata.yml -> something was added in 5.1, so I kept that. Not sure why it'd be a conflict.
This commit is contained in:
Ghostkeeper 2022-07-18 10:58:17 +02:00
commit aeae08645b
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
7 changed files with 285 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.github/workflows/cura-installer.yml vendored
View file

@ -182,8 +182,7 @@ jobs:
- name: Create the Windows exe installer (Powershell)
if: ${{ github.event.inputs.installer == 'true' && runner.os == 'Windows' }}
run: |
python ..\cura_inst\packaging\NSIS\nsis-configurator.py ".\Ultimaker-Cura" "..\cura_inst\packaging\NSIS\Ultimaker-Cura.nsi.jinja" "Ultimaker Cura" "Ultimaker-Cura.exe" "$Env:CURA_VERSION_MAJOR" "$Env:CURA_VERSION_MINOR" "$Env:CURA_VERSION_PATCH" "$Env:CURA_VERSION_BUILD" "Ultimaker B.V." "https://ultimaker.com" "..\cura_inst\packaging\cura_license.txt" "LZMA" "..\cura_inst\packaging\NSIS\cura_banner_nsis.bmp" "..\cura_inst\packaging\icons\Cura.ico" "Ultimaker-Cura-$Env:CURA_VERSION_FULL-${{ matrix.os_id }}-${{ runner.arch }}.exe"
makensis /V2 /P4 Ultimaker-Cura.nsi
python ..\cura_inst\packaging\NSIS\create_windows_installer.py ../cura_inst . "Ultimaker-Cura-$Env:CURA_VERSION_FULL-${{ matrix.os_id }}-${{ runner.arch }}.exe"
working-directory: dist
- name: Create the Linux AppImage (Bash)