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

Also make sure that the packaging tools can be run

Browse Source 
Contributes to CURA-8415
This commit is contained in:
Jelle Spijker 2023-08-19 01:56:23 +02:00
parent 82f5878439
commit fc159a2f5d
No known key found for this signature in database
GPG Key ID: 034D1C0527888B65
2 changed files with 43 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -242,27 +242,39 @@ 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: Setup Python and pip
uses: actions/setup-python@v4
with:
python-version: '3.10.x'
cache: 'pip'
cache-dependency-path: .github/workflows/requirements-conan-package.txt
- 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
@ -309,7 +321,9 @@ jobs:
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

30
.github/workflows/windows.yml vendored
View File

@ -199,29 +199,40 @@ 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 -Path ".\dist" -DestinationPath ".\${{ steps.filename.outputs.INSTALLER_FILENAME }}.zip"
Compress-Archive -Path ".\cura_inst\packaging\" -DestinationPath ".\${{ steps.filename.outputs.INSTALLER_FILENAME }}-packaging.zip"
- 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
path: | path: |
${{ steps.filename.outputs.INSTALLER_FILENAME }}.zip ${{ steps.filename.outputs.INSTALLER_FILENAME }}.zip
${{ steps.filename.outputs.INSTALLER_FILENAME }}-packaging.zip
retention-days: 5 retention-days: 5
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: Setup Python and pip
uses: actions/setup-python@v4
with:
python-version: '3.10.x'
cache: 'pip'
cache-dependency-path: .github/workflows/requirements-conan-package.txt
- 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
- 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 -Path ".\${{ needs.cura-installer-create.outputs.INSTALLER_FILENAME }}.zip" -DestinationPath "."
Expand-Archive -Path ".\${{ needs.cura-installer-create.outputs.INSTALLER_FILENAME }}-packaging.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 +269,22 @@ jobs:
needs: [ cura-installer-create ] needs: [ cura-installer-create ]
runs-on: ${{ inputs.operating_system }} runs-on: ${{ inputs.operating_system }}
steps: steps:
- name: Setup Python and pip
uses: actions/setup-python@v4
with:
python-version: '3.10.x'
cache: 'pip'
cache-dependency-path: .github/workflows/requirements-conan-package.txt
- 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: 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 -Path ".\${{ needs.cura-installer-create.outputs.INSTALLER_FILENAME }}.zip" -DestinationPath "."
Expand-Archive -Path ".\${{ needs.cura-installer-create.outputs.INSTALLER_FILENAME }}-packaging.zip" -DestinationPath "."
shell: powershell shell: powershell
- name: Create PFX certificate from BASE64_PFX_CONTENT secret - name: Create PFX certificate from BASE64_PFX_CONTENT secret