Skip to content

Commit e766df4

Browse files
flatpak: Move manifest file into data subdirectory
1 parent 0819b45 commit e766df4

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.github/workflows/testing.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,10 @@ jobs:
102102
flatpak install --user -y flathub org.gnome.Platform//45 org.gnome.Sdk//45
103103
- name: Build application
104104
run: |
105-
flatpak-builder --repo=build/flatpak/repo build/flatpak/tmp org.gnome.Hamster.yml
105+
flatpak-builder --repo=build/flatpak/repo build/flatpak/tmp data/org.gnome.Hamster.flatpak.yml
106106
- name: Run tests inside sandbox
107107
run: |
108-
dbus-launch flatpak-builder --run build/flatpak/tmp org.gnome.Hamster.yml python3 -m unittest
108+
dbus-launch flatpak-builder --run build/flatpak/tmp data/org.gnome.Hamster.flatpak.yml python3 -m unittest
109109
- name: Export bundle and try to install it
110110
run: |
111111
mkdir -p dist

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ GNOME SDK beforehand (an error will notify you about it, if needed). Execute:
175175

176176
```bash
177177
flatpak-builder --force-clean --user --install \
178-
build/flatpak org.gnome.Hamster.yml
178+
build/flatpak data/org.gnome.Hamster.flatpak.yml
179179
```
180180

181181
This creates a temporary flatpack build folder in the ``build/flatpak``
@@ -247,7 +247,7 @@ run:
247247
To run the tests inside the flatpak, use:
248248

249249
```bash
250-
flatpak-builder --run build/flatpak org.gnome.Hamster.yml \
250+
flatpak-builder --run build/flatpak data/org.gnome.Hamster.flatpak.yml \
251251
python3 -m unittest
252252
```
253253

org.gnome.Hamster.yml renamed to data/org.gnome.Hamster.flatpak.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ modules:
3434
- "./waf install"
3535
sources:
3636
- type: dir
37-
path: "."
37+
path: ".."
3838
finish-args:
3939
- "--socket=wayland"
4040
- "--socket=fallback-x11"

0 commit comments

Comments
 (0)