3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 15:44:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Parallelization fixes

Browse source 
Contributes to CURA-8415
This commit is contained in:
Jelle Spijker 2023-08-19 01:56:23 +02:00
parent 82f5878439
commit c686326e22
No known key found for this signature in database
GPG key ID: 034D1C0527888B65
4 changed files with 62 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

7
.github/workflows/installers.yml vendored
View file

@ -35,6 +35,7 @@ jobs:
staging: ${{ inputs.staging }} staging: ${{ inputs.staging }}
architecture: X64 architecture: X64
operating_system: windows-2022 operating_system: windows-2022
secrets: inherit
linux-modern-installer: linux-modern-installer:
uses: ./.github/workflows/linux.yml uses: ./.github/workflows/linux.yml
@ -45,6 +46,7 @@ jobs:
staging: ${{ inputs.staging }} staging: ${{ inputs.staging }}
architecture: X64 architecture: X64
operating_system: ubuntu-22.04 operating_system: ubuntu-22.04
secrets: inherit
linux-legacy-installer: linux-legacy-installer:
uses: ./.github/workflows/linux.yml uses: ./.github/workflows/linux.yml
@ -55,6 +57,7 @@ jobs:
staging: ${{ inputs.staging }} staging: ${{ inputs.staging }}
architecture: X64 architecture: X64
operating_system: ubuntu-20.04 operating_system: ubuntu-20.04
secrets: inherit
macos-installer: macos-installer:
uses: ./.github/workflows/macos.yml uses: ./.github/workflows/macos.yml
@ -65,6 +68,7 @@ jobs:
staging: ${{ inputs.staging }} staging: ${{ inputs.staging }}
architecture: X64 architecture: X64
operating_system: macos-11.0 operating_system: macos-11.0
secrets: inherit
macos-arm-installer: macos-arm-installer:
uses: ./.github/workflows/macos.yml uses: ./.github/workflows/macos.yml
@ -74,4 +78,5 @@ jobs:
enterprise: ${{ inputs.enterprise }} enterprise: ${{ inputs.enterprise }}
staging: ${{ inputs.staging }} staging: ${{ inputs.staging }}
architecture: ARM64 architecture: ARM64
operating_system: self-hosted operating_system: self-hosted
secrets: inherit

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:

35
.github/workflows/macos.yml vendored
View file

@ -242,27 +242,40 @@ jobs:
f.writelines(f"`{package.key}/{package.version}`\n") f.writelines(f"`{package.key}/{package.version}`\n")
- name: Archive the artifacts (bash) - name: Archive the artifacts (bash)
run: tar -zcf "./${{ steps.filename.outputs.INSTALLER_FILENAME }}.tar.gz" "./dist/" run: |
tar -zcf "./${{ steps.filename.outputs.INSTALLER_FILENAME }}.tar.gz" "./dist/"
tar -zcf "./${{ steps.filename.outputs.INSTALLER_FILENAME }}-package.tar.gz" "./cura_inst/packaging/"
- name: upload the tarred dist folder - name: upload the tarred dist and packaging folder
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: dist name: dist
path: | path: |
${{ steps.filename.outputs.INSTALLER_FILENAME }}.tar.gz ${{ steps.filename.outputs.INSTALLER_FILENAME }}.tar.gz
${{ steps.filename.outputs.INSTALLER_FILENAME }}-package.tar.gz
retention-days: 5 retention-days: 5
cura-installer-create-dmg: cura-installer-create-dmg:
needs: [ cura-installer-create ] needs: [ cura-installer-create ]
runs-on: macos-11 runs-on: macos-11
steps: steps:
- name: Checkout
uses: actions/checkout@v3
- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: '3.10.x'
- name: Download the dist - name: Download the dist
uses: actions/download-artifact@v3 uses: actions/download-artifact@v3
with: with:
name: dist name: dist
- name: untar the dist folder - name: untar the dist folder
run: tar -zxf "./${{ needs.cura-installer-create.outputs.INSTALLER_FILENAME }}.tar.gz" run: |
tar -zxf "./${{ needs.cura-installer-create.outputs.INSTALLER_FILENAME }}.tar.gz"
tar -zxf "./${{ needs.cura-installer-create.outputs.INSTALLER_FILENAME }}-package.tar.gz"
- name: Remove Macos keychain (Bash) - name: Remove Macos keychain (Bash)
run: security delete-keychain signing_temp.keychain || true run: security delete-keychain signing_temp.keychain || true
@ -287,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
@ -303,13 +316,23 @@ jobs:
needs: [ cura-installer-create ] needs: [ cura-installer-create ]
runs-on: macos-11 runs-on: macos-11
steps: steps:
- name: Checkout
uses: actions/checkout@v3
- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: '3.10.x'
- name: Download the dist - name: Download the dist
uses: actions/download-artifact@v3 uses: actions/download-artifact@v3
with: with:
name: dist name: dist
- name: untar the dist folder - name: untar the dist folder
run: tar -zxf "./${{ needs.cura-installer-create.outputs.INSTALLER_FILENAME }}.tar.gz" run: |
tar -zxf "./${{ needs.cura-installer-create.outputs.INSTALLER_FILENAME }}.tar.gz"
tar -zxf "./${{ needs.cura-installer-create.outputs.INSTALLER_FILENAME }}-package.tar.gz"
- name: Remove Macos keychain (Bash) - name: Remove Macos keychain (Bash)
run: security delete-keychain signing_temp.keychain || true run: security delete-keychain signing_temp.keychain || true
@ -334,7 +357,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 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

37
.github/workflows/windows.yml vendored
View file

@ -199,29 +199,38 @@ jobs:
for package in pkg_resources.working_set: for package in pkg_resources.working_set:
f.writelines(f"`{package.key}/{package.version}`\n") f.writelines(f"`{package.key}/{package.version}`\n")
- name: Archive the artifacts (Powershell) - name: Archive the artifacts (Powershell)
run: Compress-Archive -Path ".\dist" -DestinationPath ".\${{ steps.filename.outputs.INSTALLER_FILENAME }}.zip" run: Compress-Archive -Force -CompressionLevel NoCompression -Path @('.\dist', '.\cura_inst\packaging') -DestinationPath ".\${{ steps.filename.outputs.INSTALLER_FILENAME }}.zip"
shell: powershell
- name: upload the zipped dist folder - name: upload the zipped dist and packaging folder
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: dist name: dist-windows
path: | path: |
${{ steps.filename.outputs.INSTALLER_FILENAME }}.zip ${{ steps.filename.outputs.INSTALLER_FILENAME }}.zip
retention-days: 5 retention-days: 1
if-no-files-found: error
cura-installer-create-exe: cura-installer-create-exe:
needs: [ cura-installer-create ] needs: [ cura-installer-create ]
runs-on: ${{ inputs.operating_system }} runs-on: ${{ inputs.operating_system }}
steps: steps:
- name: Checkout
uses: actions/checkout@v3
- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: '3.10.x'
- name: Download the zipped dist - name: Download the zipped dist
uses: actions/download-artifact@v3 uses: actions/download-artifact@v3
with: with:
name: dist name: dist-windows
- name: Extract the zipped dist - name: Extract the zipped dist
run: Expand-Archive -Path ".\${{ needs.cura-installer-create.outputs.INSTALLER_FILENAME }}.zip" -DestinationPath "." run: Expand-Archive -Force -Path ".\${{ needs.cura-installer-create.outputs.INSTALLER_FILENAME }}.zip" -DestinationPath .
shell: powershell shell: powershell
- name: Create PFX certificate from BASE64_PFX_CONTENT secret - name: Create PFX certificate from BASE64_PFX_CONTENT secret
@ -258,13 +267,21 @@ jobs:
needs: [ cura-installer-create ] needs: [ cura-installer-create ]
runs-on: ${{ inputs.operating_system }} runs-on: ${{ inputs.operating_system }}
steps: steps:
- name: Download the dist - name: Checkout
uses: actions/checkout@v3
- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: '3.10.x'
- name: Download the zipped dist
uses: actions/download-artifact@v3 uses: actions/download-artifact@v3
with: with:
name: dist name: dist-windows
- name: Extract the zipped dist - name: Extract the zipped dist
run: Expand-Archive -Path ".\${{ needs.cura-installer-create.outputs.INSTALLER_FILENAME }}.zip" -DestinationPath "." run: Expand-Archive -Force -Path ".\${{ needs.cura-installer-create.outputs.INSTALLER_FILENAME }}.zip" -DestinationPath .
shell: powershell shell: powershell
- name: Create PFX certificate from BASE64_PFX_CONTENT secret - name: Create PFX certificate from BASE64_PFX_CONTENT secret