From 0cc286a159a4975831c860088d61d16c4d7ffd15 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Sat, 19 Aug 2023 01:37:01 +0200 Subject: [PATCH] level up Contributes to CURA-8415 --- .github/workflows/macos.yml | 7 ++----- .github/workflows/windows.yml | 9 ++++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 7ba83ca70b..4c77692cff 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -242,15 +242,14 @@ jobs: f.writelines(f"`{package.key}/{package.version}`\n") - name: Archive the artifacts (bash) - run: tar -zcf "./${{ steps.filename.outputs.INSTALLER_FILENAME }}.tar.gz" "./UltiMaker-Cura/" - working-directory: dist + run: tar -zcf "./${{ steps.filename.outputs.INSTALLER_FILENAME }}.tar.gz" "./dist/" - name: upload the tarred dist folder uses: actions/upload-artifact@v3 with: name: dist path: | - dist/${{ steps.filename.outputs.INSTALLER_FILENAME }}.tar.gz + ${{ steps.filename.outputs.INSTALLER_FILENAME }}.tar.gz retention-days: 5 cura-installer-create-dmg: @@ -264,7 +263,6 @@ jobs: - name: untar the dist folder run: tar -zxf "./${{ needs.cura-installer-create.outputs.INSTALLER_FILENAME }}.tar.gz" - working-directory: dist - name: Remove Macos keychain (Bash) run: security delete-keychain signing_temp.keychain || true @@ -312,7 +310,6 @@ jobs: - name: untar the dist folder run: tar -zxf "./${{ needs.cura-installer-create.outputs.INSTALLER_FILENAME }}.tar.gz" - working-directory: dist - name: Remove Macos keychain (Bash) run: security delete-keychain signing_temp.keychain || true diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 715b05056b..f335605b91 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -201,15 +201,14 @@ jobs: - name: Archive the artifacts (Powershell) - run: Compress-Archive -Path ".\UltiMaker-Cura" -DestinationPath ".\${{ steps.filename.outputs.INSTALLER_FILENAME }}.zip" - working-directory: dist + run: Compress-Archive -Path ".\dist" -DestinationPath ".\${{ steps.filename.outputs.INSTALLER_FILENAME }}.zip" - name: upload the zipped dist folder uses: actions/upload-artifact@v3 with: name: dist path: | - dist/${{ steps.filename.outputs.INSTALLER_FILENAME }}.zip + ${{ steps.filename.outputs.INSTALLER_FILENAME }}.zip retention-days: 5 cura-installer-create-exe: @@ -222,7 +221,7 @@ jobs: name: dist - name: Extract the zipped dist - run: Expand-Archive -Path ".\dist\${{ needs.cura-installer-create.outputs.INSTALLER_FILENAME }}.zip" -DestinationPath ".\dist" + run: Expand-Archive -Path ".\${{ needs.cura-installer-create.outputs.INSTALLER_FILENAME }}.zip" -DestinationPath "." shell: powershell - name: Create PFX certificate from BASE64_PFX_CONTENT secret @@ -265,7 +264,7 @@ jobs: name: dist - name: Extract the zipped dist - run: Expand-Archive -Path ".\dist\${{ needs.cura-installer-create.outputs.INSTALLER_FILENAME }}.zip" -DestinationPath ".\dist" + run: Expand-Archive -Path ".\${{ needs.cura-installer-create.outputs.INSTALLER_FILENAME }}.zip" -DestinationPath "." shell: powershell - name: Create PFX certificate from BASE64_PFX_CONTENT secret