diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index 3aed30ab4..4b5fb0efa 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -12,10 +12,10 @@ on: outputs: sha256-appimage-x64: description: "SHA256 sum of the x64 appimage" - value: ${{ jobs.build.outputs.x64-sha256sum}} + value: ${{ jobs.collect-sha256sums.outputs.x64-sha256sum}} sha256-appimage-aarch64: description: "SHA256 sum of the aarch64 appimage" - value: ${{ jobs.build.outputs.aarch64-sha256sum}} + value: ${{ jobs.collect-sha256sums.outputs.aarch64-sha256sum}} workflow_dispatch: inputs: version: @@ -48,9 +48,6 @@ jobs: name: Build AppImage runs-on: ${{ matrix.os }} needs: [get-version] - outputs: - x64-sha256sum: ${{ steps.sha256sum.outputs.value-x86_64 }} - aarch64-sha256sum: ${{ steps.sha256sum.outputs.value-aarch64 }} env: SEMVER_STR: ${{ needs.get-version.outputs.semVerStr }} SEMVER_NUM: ${{ needs.get-version.outputs.semVerNum }} @@ -200,10 +197,6 @@ jobs: ./squashfs-root/AppRun Cryptomator.AppDir cryptomator-${SEMVER_STR}-${{ matrix.arch }}.AppImage -u "gh-releases-zsync|cryptomator|cryptomator|latest|cryptomator-*-${{ matrix.arch }}.AppImage.zsync" --sign --sign-key=615D449FE6E6A235 - - id: sha256sum - run: | - read -ra CMD_OUTPUT < <(sha256sum cryptomator-*.AppImage) - echo "value-${{matrix.arch}}=${CMD_OUTPUT[0]}" >> $GITHUB_OUTPUT - name: Create detached GPG signatures run: | gpg --batch --quiet --passphrase-fd 0 --pinentry-mode loopback -u 615D449FE6E6A235 --detach-sign -a cryptomator-*.AppImage @@ -229,6 +222,27 @@ jobs: cryptomator-*.zsync cryptomator-*.asc + collect-sha256sums: + name: Collect AppImage checksums + runs-on: ubuntu-latest + needs: [build] + outputs: + x64-sha256sum: ${{ steps.sha256sum.outputs.x64-sha256sum }} + aarch64-sha256sum: ${{ steps.sha256sum.outputs.aarch64-sha256sum }} + steps: + - name: Download AppImage artifacts + uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0 + with: + pattern: appimage-* + path: appimage-artifacts + - name: Compute SHA256 sums + id: sha256sum + run: | + read -ra X64_SUM < <(sha256sum appimage-artifacts/appimage-x86_64/cryptomator-*-x86_64.AppImage) + read -ra AARCH64_SUM < <(sha256sum appimage-artifacts/appimage-aarch64/cryptomator-*-aarch64.AppImage) + echo "x64-sha256sum=${X64_SUM[0]}" >> "$GITHUB_OUTPUT" + echo "aarch64-sha256sum=${AARCH64_SUM[0]}" >> "$GITHUB_OUTPUT" + create-aur-bin-pr: name: Create PR for aur-bin repo if: github.event_name == 'workflow_dispatch' && inputs.create-pr || github.event_name == 'release' && needs.get-version.outputs.versionType == 'stable' diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index afe71df70..67898e158 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -404,6 +404,10 @@ jobs: tenant-id: ${{ secrets.AZURE_TENANT_ID }} client-id: ${{ secrets.AZURE_CLIENT_ID }} client-secret: ${{ secrets.AZURE_CLIENT_SECRET }} + - id: sha256sum + run: | + read -ra CMD_OUTPUT < <(sha256sum installer/Cryptomator-*.exe) + echo "value=${CMD_OUTPUT[0]}" >> $GITHUB_OUTPUT - name: Add possible alpha/beta tags to installer name run: mv installer/Cryptomator-Installer.exe Cryptomator-${{ needs.get-version.outputs.semVerStr }}-${{ matrix.executable-suffix }}.exe - name: Create detached GPG signature with key 615D449FE6E6A235