Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use Qt/KDE runtime 6.8 for Flatpak test builds #529

Merged
merged 4 commits into from
Nov 17, 2024
Merged

Use Qt/KDE runtime 6.8 for Flatpak test builds #529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
66895b0
Update Flatpak manifest to Qt 6.8, match beta
matterhorn103 Nov 16, 2024
0e53ebe
Use Flatpak of flatpak-builder so that we use latest build
matterhorn103 Nov 16, 2024
efb08e5
Have to run with dbus-run-session
matterhorn103 Nov 16, 2024
84ed40c
Turn off radpidjson tests etc., build in debug mode
matterhorn103 Nov 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/flatpak.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ jobs:
- name: Configure flatpak
run: flatpak remote-add --if-not-exists --user flathub https://dl.flathub.org/repo/flathub.flatpakrepo

- name: Install flatpak-builder
run: flatpak --user install --or-update --noninteractive flathub org.flatpak.Builder

- name: Configure git
run: git config --global protocol.file.allow always
# Have to do this because for a while git's handling of submodules was broken
Expand Down Expand Up @@ -81,7 +84,7 @@ jobs:
run: mv openchemistry/avogadroapp/flatpak/org.openchemistry.Avogadro2.yaml ./

- name: Build with flatpak-builder
run: flatpak-builder --force-clean --user --install-deps-from=flathub --arch=x86_64 --default-branch=test --repo=repo builddir org.openchemistry.Avogadro2.yaml
run: dbus-run-session flatpak run org.flatpak.Builder --force-clean --user --install-deps-from=flathub --arch=x86_64 --default-branch=test --repo=repo builddir org.openchemistry.Avogadro2.yaml

- name: Create bundle
run: flatpak build-bundle repo Avogadro2.flatpak org.openchemistry.Avogadro2 test
Expand Down
17 changes: 12 additions & 5 deletions flatpak/org.openchemistry.Avogadro2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
app-id: org.openchemistry.Avogadro2
runtime: org.kde.Platform
sdk: org.kde.Sdk
runtime-version: "6.7"
runtime-version: "6.8"
command: avogadro2
appdata-license: BSD-3-Clause AND GPL-2.0-only
finish-args:
Expand All @@ -11,7 +11,6 @@ finish-args:
- --device=dri # OpenGL rendering
- --share=network # For plugin downloads
cleanup:
- /include
- /lib/cmake
- '*.la'
- '*.a'
Expand All @@ -24,6 +23,10 @@ modules:
- name: rapidjson
buildsystem: cmake-ninja
builddir: true
config-opts:
- -DRAPIDJSON_BUILD_DOC=OFF
- -DRAPIDJSON_BUILD_EXAMPLES=OFF
- -DRAPIDJSON_BUILD_TESTS=OFF
sources:
- type: git
url: https://github.com/Tencent/rapidjson.git
Expand All @@ -38,7 +41,7 @@ modules:
no-make-install: true # Superbuild doesn't have `install` command defined
config-opts:
# Match GitHub builds as much as possible, which generally means using defaults
- -DCMAKE_BUILD_TYPE=Release
- -DCMAKE_BUILD_TYPE=Debug
- -DUSE_VTK=ON
- -DBUILD_GPL_PLUGINS=ON
- -DBUILD_MOLEQUEUE=OFF
Expand Down Expand Up @@ -107,5 +110,9 @@ modules:

post-install:
# Manually copy contents of prefix dir over into main build dir
# -a option is recursive should preserve permissions and symlinks
- cp -a prefix/* -t ${FLATPAK_DEST}/
# -a option is recursive, should preserve permissions and symlinks
- cp -a prefix/bin -t ${FLATPAK_DEST}/
- cp -a prefix/lib -t ${FLATPAK_DEST}/
- cp -a prefix/lib64/* -t ${FLATPAK_DEST}/lib/ # Merge with lib
- ln -rs ${FLATPAK_DEST}/lib ${FLATPAK_DEST}/lib64 # Add a symlink so plugins get found
- cp -a prefix/share -t ${FLATPAK_DEST}/
Loading