From 3c633f8a343a6f7a0435677d48881dc67c005347 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Fri, 20 Mar 2026 16:54:05 +0100 Subject: [PATCH] move all build scripts into flatpak-build dir * additionally, remove maven-dependencies --- .github/workflows/linux-flatpak.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/linux-flatpak.yml b/.github/workflows/linux-flatpak.yml index 396168e14..6b4b07ccd 100644 --- a/.github/workflows/linux-flatpak.yml +++ b/.github/workflows/linux-flatpak.yml @@ -41,22 +41,24 @@ jobs: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: path: cryptomator - - name: Get SHA of HEAD commit - id: git-head-sha - run: echo "head-sha=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT - - name: Transform build template into build script - run: envsubst '$FLATPAK_VERSION $FLATPAK_REVISION $CRYPTOMATOR_SOURCE' < cryptomator/dist/linux/flatpak/org.cryptomator.Cryptomator.TEMPLATE.yaml > org.cryptomator.Cryptomator.yaml + - name: Prepare build files + run: | + mkdir flatpak-build + cp -r -f cryptomator/dist/linux/flatpak flatpak-build + envsubst '$FLATPAK_VERSION $FLATPAK_REVISION $CRYPTOMATOR_SOURCE' < flatpak-build/org.cryptomator.Cryptomator.TEMPLATE.yaml > flatpak-build/org.cryptomator.Cryptomator.yaml + yq '(.modules[] | select(.name == "cryptomator") | .build-options.build-args) = ["--share=network"]' -i flatpak-build/org.cryptomator.Cryptomator.yaml + yq '(.modules[] | select(.name == "cryptomator") | .sources) |= map(select( . == "maven*" | not))' -i flatpak-build/org.cryptomator.Cryptomator.yaml env: FLATPAK_VERSION: ${{ needs.get-version.outputs.semVerNum }} FLATPAK_REVISION: 1 CRYPTOMATOR SOURCE: |- type: git path: cryptomator - commit: ${{ steps.git-head-sha.outputs.head-sha }} + commit: ${{ github.sha }} - uses: flatpak/flatpak-github-actions/flatpak-builder@92ae9851ad316786193b1fd3f40c4b51eb5cb101 # v6.6 with: bundle: cryptomator.flatpak - manifest-path: org.cryptomator.Cryptomator.yaml + manifest-path: flatpak-build/org.cryptomator.Cryptomator.yaml cache-key: flatpak-builder-${{ github.sha }} #build-dir: flatpak_app #gpg-sign: