From 3a2de81369e1e0f59a39b439205c2e3b51be74e5 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Tue, 24 Mar 2026 12:37:10 +0100 Subject: [PATCH] do not use placeholder files --- .github/workflows/linux-flatpak.yml | 1 + dist/linux/flatpak/javafx-maven-dependencies-aarch64.yaml | 1 - dist/linux/flatpak/javafx-maven-dependencies-x86_64.yaml | 1 - dist/linux/flatpak/maven-dependencies.yaml | 1 - dist/linux/flatpak/org.cryptomator.Cryptomator.TEMPLATE.yaml | 3 --- 5 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 dist/linux/flatpak/javafx-maven-dependencies-aarch64.yaml delete mode 100644 dist/linux/flatpak/javafx-maven-dependencies-x86_64.yaml delete mode 100644 dist/linux/flatpak/maven-dependencies.yaml diff --git a/.github/workflows/linux-flatpak.yml b/.github/workflows/linux-flatpak.yml index 8dbbef166..edc4d59ca 100644 --- a/.github/workflows/linux-flatpak.yml +++ b/.github/workflows/linux-flatpak.yml @@ -184,6 +184,7 @@ jobs: cp -r -f mvn-src-aarch64/* . envsubst '$FLATPAK_VERSION $FLATPAK_REVISION $CRYPTOMATOR_SOURCE' < org.cryptomator.Cryptomator.TEMPLATE.yaml > org.cryptomator.Cryptomator.yaml yq -i 'del(.modules[] | select(.name == "cryptomator") | .build-options.build-args)' org.cryptomator.Cryptomator.yaml + yq -i '(.modules[] | select(.name == "cryptomator") | .sources) += ["maven-dependencies.yaml", "javafx-maven-dependencies-x86_64.yaml", "javafx-maven-dependencies-aarch64.yaml"]' org.cryptomator.Cryptomator.yaml env: FLATPAK_VERSION: ${{ needs.get-version.outputs.semVerNum }} FLATPAK_REVISION: 1 diff --git a/dist/linux/flatpak/javafx-maven-dependencies-aarch64.yaml b/dist/linux/flatpak/javafx-maven-dependencies-aarch64.yaml deleted file mode 100644 index 3ce2d05db..000000000 --- a/dist/linux/flatpak/javafx-maven-dependencies-aarch64.yaml +++ /dev/null @@ -1 +0,0 @@ -# placeholder file \ No newline at end of file diff --git a/dist/linux/flatpak/javafx-maven-dependencies-x86_64.yaml b/dist/linux/flatpak/javafx-maven-dependencies-x86_64.yaml deleted file mode 100644 index 3ce2d05db..000000000 --- a/dist/linux/flatpak/javafx-maven-dependencies-x86_64.yaml +++ /dev/null @@ -1 +0,0 @@ -# placeholder file \ No newline at end of file diff --git a/dist/linux/flatpak/maven-dependencies.yaml b/dist/linux/flatpak/maven-dependencies.yaml deleted file mode 100644 index 3ce2d05db..000000000 --- a/dist/linux/flatpak/maven-dependencies.yaml +++ /dev/null @@ -1 +0,0 @@ -# placeholder file \ No newline at end of file diff --git a/dist/linux/flatpak/org.cryptomator.Cryptomator.TEMPLATE.yaml b/dist/linux/flatpak/org.cryptomator.Cryptomator.TEMPLATE.yaml index 3cf0e91f7..0adc4e8ea 100644 --- a/dist/linux/flatpak/org.cryptomator.Cryptomator.TEMPLATE.yaml +++ b/dist/linux/flatpak/org.cryptomator.Cryptomator.TEMPLATE.yaml @@ -146,9 +146,6 @@ modules: - install -D -m0644 -t /app/share/metainfo/ dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml sources: - $CRYPTOMATOR_SOURCE - - maven-dependencies.yaml - - javafx-maven-dependencies-aarch64.yaml - - javafx-maven-dependencies-x86_64.yaml - type: file dest-filename: jdk.tar.gz only-arches: