diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 7eac188e6..ff13068fd 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -102,10 +102,10 @@ jobs: flatpak install --user -y flathub org.gnome.Platform//45 org.gnome.Sdk//45 - name: Build application run: | - flatpak-builder --repo=build/flatpak/repo build/flatpak/tmp org.gnome.Hamster.yml + flatpak-builder --repo=build/flatpak/repo build/flatpak/tmp data/org.gnome.Hamster.flatpak.yml - name: Run tests inside sandbox run: | - dbus-launch flatpak-builder --run build/flatpak/tmp org.gnome.Hamster.yml python3 -m unittest + dbus-launch flatpak-builder --run build/flatpak/tmp org.gnome.Hamster.flatpak.yml python3 -m unittest - name: Export bundle and try to install it run: | mkdir -p dist diff --git a/README.md b/README.md index 91b671007..b3c116d37 100644 --- a/README.md +++ b/README.md @@ -175,7 +175,7 @@ GNOME SDK beforehand (an error will notify you about it, if needed). Execute: ```bash flatpak-builder --force-clean --user --install \ - build/flatpak org.gnome.Hamster.yml + build/flatpak data/org.gnome.Hamster.flatpak.yml ``` This creates a temporary flatpack build folder in the ``build/flatpak`` @@ -247,7 +247,7 @@ run: To run the tests inside the flatpak, use: ```bash -flatpak-builder --run build/flatpak org.gnome.Hamster.yml \ +flatpak-builder --run build/flatpak data/org.gnome.Hamster.flatpak.yml \ python3 -m unittest ``` diff --git a/org.gnome.Hamster.yml b/data/org.gnome.Hamster.flatpak.yml similarity index 98% rename from org.gnome.Hamster.yml rename to data/org.gnome.Hamster.flatpak.yml index 47c285eda..7539591fc 100644 --- a/org.gnome.Hamster.yml +++ b/data/org.gnome.Hamster.flatpak.yml @@ -34,7 +34,7 @@ modules: - "./waf install" sources: - type: dir - path: "." + path: ".." finish-args: - "--socket=wayland" - "--socket=fallback-x11"