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

few minor fixes

Browse Source 
Contributes to CURA-8415
This commit is contained in:
Jelle Spijker 2023-08-19 03:01:53 +02:00
parent deffdeb642
commit 365166e493
No known key found for this signature in database
GPG Key ID: 034D1C0527888B65
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/linux.yml vendored
View File

@ -179,7 +179,6 @@ jobs:
run: | run: |
import os import os
enterprise = "-Enterprise" if "${{ inputs.enterprise }}" == "true" else "" enterprise = "-Enterprise" if "${{ inputs.enterprise }}" == "true" else ""
installer_filename = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-linux-${{ inputs.architecture }}"
if "${{ inputs.operating_system }}" == "ubuntu-22.04": if "${{ inputs.operating_system }}" == "ubuntu-22.04":
installer_filename = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-linux-modern-${{ inputs.architecture }}" installer_filename = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-linux-modern-${{ inputs.architecture }}"
else: else:

7
.github/workflows/macos.yml vendored
View File

@ -300,7 +300,7 @@ jobs:
- name: Install MacOS system requirements - name: Install MacOS system requirements
run: brew install create-dmg run: brew install create-dmg
- name: Create the Macos dmg and pkg (Bash) - name: Create the Macos dmg (Bash)
run: python ../cura_inst/packaging/MacOS/build_macos.py --source_path ../cura_inst --dist_path . --cura_conan_version $CURA_CONAN_VERSION --filename "${{ needs.cura-installer-create.outputs.INSTALLER_FILENAME }}" --build_dmg --app_name "$CURA_APP_NAME" run: python ../cura_inst/packaging/MacOS/build_macos.py --source_path ../cura_inst --dist_path . --cura_conan_version $CURA_CONAN_VERSION --filename "${{ needs.cura-installer-create.outputs.INSTALLER_FILENAME }}" --build_dmg --app_name "$CURA_APP_NAME"
working-directory: dist working-directory: dist
@ -354,7 +354,10 @@ jobs:
p12-file-base64: ${{ secrets.MACOS_CERT_INSTALLER_P12 }} p12-file-base64: ${{ secrets.MACOS_CERT_INSTALLER_P12 }}
p12-password: ${{ secrets.MACOS_CERT_PASSPHRASE }} p12-password: ${{ secrets.MACOS_CERT_PASSPHRASE }}
- name: Create the Macos dmg and pkg (Bash) - name: Install MacOS system requirements
run: brew install create-dmg
- name: Create the Macos pkg (Bash)
run: python ../cura_inst/packaging/MacOS/build_macos.py --source_path ../cura_inst --dist_path . --cura_conan_version $CURA_CONAN_VERSION --filename "${{ needs.cura-installer-create.outputs.INSTALLER_FILENAME }}" --build_pkg --app_name "$CURA_APP_NAME" run: python ../cura_inst/packaging/MacOS/build_macos.py --source_path ../cura_inst --dist_path . --cura_conan_version $CURA_CONAN_VERSION --filename "${{ needs.cura-installer-create.outputs.INSTALLER_FILENAME }}" --build_pkg --app_name "$CURA_APP_NAME"
working-directory: dist working-directory: dist