Skip to content

Commit

Permalink
flatpak: Move manifest file into data subdirectory
Browse files Browse the repository at this point in the history
  • Loading branch information
matthijskooijman committed Dec 2, 2023
1 parent 0819b45 commit 6210298
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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``
Expand Down Expand Up @@ -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
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ modules:
- "./waf install"
sources:
- type: dir
path: "."
path: ".."
finish-args:
- "--socket=wayland"
- "--socket=fallback-x11"
Expand Down

0 comments on commit 6210298

Please sign in to comment.