Use flathub repo

remove yq edits and simply override build yaml
This commit is contained in:
Armin Schrenk
2026-03-20 17:51:10 +01:00
parent a5ccfa01d2
commit f7b13dd121
7 changed files with 8 additions and 3158 deletions
+6 -9
View File
@@ -42,9 +42,14 @@ jobs:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
path: cryptomator
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
repository: flathub/org.cryptomator.Cryptomator
path: flatpak-build
submodules: true
- name: Prepare build files
run: |
cp -r -f cryptomator/dist/linux/flatpak 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
env:
FLATPAK_VERSION: ${{ needs.get-version.outputs.semVerNum }}
@@ -53,14 +58,6 @@ jobs:
type: git
path: cryptomator
commit: ${{ github.sha }}
- name: Enable network access for flatpak
uses: mikefarah/yq@5a7e72a743649b1b3a47d1a1d8214f3453173c51 # v4.52.4
with:
cmd: yq '(.modules[] | select(.name == "cryptomator") | .build-options.build-args) = ["--share=network"]' -i flatpak-build/org.cryptomator.Cryptomator.yaml
- name: Remove maven dependencies
uses: mikefarah/yq@5a7e72a743649b1b3a47d1a1d8214f3453173c51 # v4.52.4
with:
cmd: yq '(.modules[] | select(.name == "cryptomator") | .sources) |= map(select( . == "maven*" | not))' -i flatpak-build/org.cryptomator.Cryptomator.yaml
- uses: flatpak/flatpak-github-actions/flatpak-builder@92ae9851ad316786193b1fd3f40c4b51eb5cb101 # v6.6
with:
bundle: cryptomator.flatpak
-13
View File
@@ -1,13 +0,0 @@
#
# Excludes
.flatpak-builder/
.idea/
build/
.DS_Store
Thumbs.db
*.iml
#
# Includes
-3
View File
@@ -1,3 +0,0 @@
[submodule "shared-modules"]
path = shared-modules
url = https://github.com/flathub/shared-modules.git
-25
View File
@@ -1,25 +0,0 @@
- type: file
dest: .m2/repository/org/openjfx/javafx-base/25.0.2
url: https://repo.maven.apache.org/maven2/org/openjfx/javafx-base/25.0.2/javafx-base-25.0.2-linux-aarch64.jar
sha256: 465697a5e51f56f99b3920d53df7a0472e930156fdb70f633ea7a42b07a84cd5
only-arches: [aarch64]
- type: file
dest: .m2/repository/org/openjfx/javafx-controls/25.0.2
url: https://repo.maven.apache.org/maven2/org/openjfx/javafx-controls/25.0.2/javafx-controls-25.0.2-linux-aarch64.jar
sha256: 490c37ef1a6d9c46fc72e8445901c577dd604bde5b0aa0b9b2957b6508e57b19
only-arches: [aarch64]
- type: file
dest: .m2/repository/org/openjfx/javafx-fxml/25.0.2
url: https://repo.maven.apache.org/maven2/org/openjfx/javafx-fxml/25.0.2/javafx-fxml-25.0.2-linux-aarch64.jar
sha256: 656688d2fd3d12f2f689b0fa133b46ad5f907eac96e0c1dcabae572d0eac35d8
only-arches: [aarch64]
- type: file
dest: .m2/repository/org/openjfx/javafx-graphics/25.0.2
url: https://repo.maven.apache.org/maven2/org/openjfx/javafx-graphics/25.0.2/javafx-graphics-25.0.2-linux-aarch64.jar
sha256: 2489ad216e970fbad968998da9d199ea984f64a291b2e95d9db65fe1311bfd8d
only-arches: [aarch64]
- type: file
dest: .m2/repository/org/openjfx/javafx-swing/25.0.2
url: https://repo.maven.apache.org/maven2/org/openjfx/javafx-swing/25.0.2/javafx-swing-25.0.2-linux-aarch64.jar
sha256: f4505c4f11ddf95adc8dd06417fd49a2a9d0f19a2c8323f5f449b8bbc9c5dd2c
only-arches: [aarch64]
-25
View File
@@ -1,25 +0,0 @@
- type: file
dest: .m2/repository/org/openjfx/javafx-base/25.0.2
url: https://repo.maven.apache.org/maven2/org/openjfx/javafx-base/25.0.2/javafx-base-25.0.2-linux.jar
sha256: eb11384d3ac0c13b42c27d49a1cb01d469dec640f245828d323bca016c2311c0
only-arches: [x86_64]
- type: file
dest: .m2/repository/org/openjfx/javafx-controls/25.0.2
url: https://repo.maven.apache.org/maven2/org/openjfx/javafx-controls/25.0.2/javafx-controls-25.0.2-linux.jar
sha256: 3937b7215c0a9b02fdaafd2bb694a6efce27fa226809c6ca970a8a02b1691cb9
only-arches: [x86_64]
- type: file
dest: .m2/repository/org/openjfx/javafx-fxml/25.0.2
url: https://repo.maven.apache.org/maven2/org/openjfx/javafx-fxml/25.0.2/javafx-fxml-25.0.2-linux.jar
sha256: a96b973c0083a03385948ee02d7cfbd28b807d98f4498ae3e920f6da6caf7ab6
only-arches: [x86_64]
- type: file
dest: .m2/repository/org/openjfx/javafx-graphics/25.0.2
url: https://repo.maven.apache.org/maven2/org/openjfx/javafx-graphics/25.0.2/javafx-graphics-25.0.2-linux.jar
sha256: a43e751003621f9f0b19666e92a147d62da924fb2c0229c1e49ec39d9d21c4b2
only-arches: [x86_64]
- type: file
dest: .m2/repository/org/openjfx/javafx-swing/25.0.2
url: https://repo.maven.apache.org/maven2/org/openjfx/javafx-swing/25.0.2/javafx-swing-25.0.2-linux.jar
sha256: a75e6504ac03331f4ae3be0d181c7c970c526de1b53ad2e5c44e8d31026bf5ec
only-arches: [x86_64]
File diff suppressed because it is too large Load Diff
@@ -76,6 +76,8 @@ modules:
- name: cryptomator
buildsystem: simple
build-options:
build-args:
- --share=network
env:
PATH: /app/bin:/usr/bin
MAVEN_OPTS: -Dmaven.repo.local=.m2/repository
@@ -144,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
- maven-dependencies-x86_64.yaml
- maven-dependencies-aarch64.yaml
- type: file
dest-filename: jdk.tar.gz
only-arches: