Merge pull request #1796 from matterhorn103/flatpak-6.8

Use Flatpak of flatpak-builder so that we use latest build
OpenChemistry · Nov 18, 2024 · 5c130f5 · 5c130f5
2 parents 83d064b + 4768889
commit 5c130f5
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
@@ -9,11 +9,14 @@ jobs:
 
     steps:
     - name: Install dependencies
-      run: sudo apt update -qq && sudo apt install -y -qq flatpak flatpak-builder
+      run: sudo apt update -qq && sudo apt install -y -qq flatpak
 
     - 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
@@ -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