From 8f0c6eb994a1fba0c086ab76323d9e9e9209022d Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Thu, 9 Apr 2026 16:49:37 +0200 Subject: [PATCH] fix bugs * win-exe still checked for release event * only perform appimage checksum step on release * remove unused input in appimage flow --- .github/workflows/appimage.yml | 5 +---- .github/workflows/win-exe.yml | 10 ++++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index 59db89176..e9744e838 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -21,10 +21,6 @@ on: version: description: 'Version' required: false - create-pr: - description: 'Create a PR for aur-bin repo' - type: boolean - default: false push: branches-ignore: - 'dependabot/**' @@ -226,6 +222,7 @@ jobs: name: Collect AppImage checksums runs-on: ubuntu-latest needs: [build] + if: inputs.is-release outputs: x64-sha256sum: ${{ steps.sha256sum.outputs.x64-sha256sum }} aarch64-sha256sum: ${{ steps.sha256sum.outputs.aarch64-sha256sum }} diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index 3d0712000..56ffe9660 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -208,7 +208,7 @@ jobs: & $env:JAVA_HOME\bin\jmod.exe extract --dir jpackage-jmod "${env:JAVA_HOME}\jmods\jdk.jpackage.jmod" Get-ChildItem -Recurse -Path "jpackage-jmod" -File wixhelper.dll | Select-Object -Last 1 | Copy-Item -Destination "appdir" - name: Sign DLLs with Azure Trusted Signing - if: inputs.sign || github.event_name == 'release' || github.event_name == 'schedule' + if: inputs.sign || inputs.is-release || github.event_name == 'schedule' uses: ./.github/actions/win-sign-action with: base-dir: ${{ github.workspace }}\appdir @@ -266,7 +266,7 @@ jobs: JP_WIXWIZARD_RESOURCES: ${{ github.workspace }}/dist/win/resources # requires abs path, used in resources/main.wxs JP_WIXHELPER_DIR: ${{ github.workspace }}\appdir - name: Sign MSI with Azure Trusted Signing - if: inputs.sign || github.event_name == 'release' || github.event_name == 'schedule' + if: inputs.sign || inputs.is-release || github.event_name == 'schedule' uses: ./.github/actions/win-sign-action with: base-dir: ${{ github.workspace }}\installer @@ -377,10 +377,11 @@ jobs: ./bundle/bundleWithWinfsp.wxs -out "../../installer/unsigned/Cryptomator-Installer.exe" - name: Detach burn engine in preparation to sign + if: inputs.sign || inputs.is-release || github.event_name == 'schedule' run: > wix burn detach installer/unsigned/Cryptomator-Installer.exe -engine tmp/engine.exe - name: Sign WiX burn engine with Azure Trusted Signing - if: inputs.sign || github.event_name == 'release' || github.event_name == 'schedule' + if: inputs.sign || inputs.is-release || github.event_name == 'schedule' uses: ./.github/actions/win-sign-action with: base-dir: ${{ github.workspace }}\tmp @@ -391,10 +392,11 @@ jobs: client-id: ${{ secrets.AZURE_CLIENT_ID }} client-secret: ${{ secrets.AZURE_CLIENT_SECRET }} - name: Reattach signed burn engine to installer + if: inputs.sign || inputs.is-release || github.event_name == 'schedule' run: > wix burn reattach installer/unsigned/Cryptomator-Installer.exe -engine tmp/engine.exe -o installer/Cryptomator-Installer.exe - name: Sign EXE installer with Azure Trusted Signing - if: inputs.sign || github.event_name == 'release' || github.event_name == 'schedule' + if: inputs.sign || inputs.is-release || github.event_name == 'schedule' uses: ./.github/actions/win-sign-action with: base-dir: ${{ github.workspace }}\installer