diff options
| author | Ernestas Kulik <ernestask@gnome.org> | 2018-03-19 13:53:22 +0200 |
|---|---|---|
| committer | Ernestas Kulik <ernestask@gnome.org> | 2018-03-19 14:13:43 +0200 |
| commit | 203939cdaa807a13a01ff28323d22e7bb8224c25 (patch) | |
| tree | 32b03147c7070fe0a819848ba9fd2cbc34821219 | |
| parent | 3531992ba71f0f387394b5818457459798555678 (diff) | |
| download | nautilus-203939cdaa807a13a01ff28323d22e7bb8224c25.tar.gz | |
Flatpak: Don’t rename the manifest
We can have non-matching ID and file name, and we only keep one
manifest.
| -rw-r--r-- | .gitlab-ci.yml | 10 | ||||
| -rw-r--r-- | build-aux/flatpak/org.gnome.Nautilus.json (renamed from build-aux/flatpak/org.gnome.NautilusDevel.json) | 0 |
2 files changed, 5 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 12ce2a39c..0fffa35be 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,16 +15,16 @@ flatpak:master: image: flatpak/flatpak-builder:gnome-3-28 stage: test script: - - flatpak-builder --stop-at=nautilus app build-aux/flatpak/org.gnome.NautilusDevel.json + - flatpak-builder --stop-at=nautilus app build-aux/flatpak/org.gnome.Nautilus.json # Make sure to keep this in sync with the Flatpak manifest, all arguments # are passed except the config-args because we build it ourselves - - flatpak-builder --run app build-aux/flatpak/org.gnome.NautilusDevel.json meson --prefix=/app --libdir=/app/lib -Dprofile=stable-flatpak _build - - flatpak-builder --run app build-aux/flatpak/org.gnome.NautilusDevel.json ninja -C _build install - - flatpak-builder --finish-only --repo=repo app build-aux/flatpak/org.gnome.NautilusDevel.json + - flatpak-builder --run app build-aux/flatpak/org.gnome.Nautilus.json meson --prefix=/app --libdir=/app/lib -Dprofile=stable-flatpak _build + - flatpak-builder --run app build-aux/flatpak/org.gnome.Nautilus.json ninja -C _build install + - flatpak-builder --finish-only --repo=repo app build-aux/flatpak/org.gnome.Nautilus.json # Make a Flatpak Nautilus bundle for people to test - flatpak build-bundle repo nautilus-dev.flatpak org.gnome.NautilusStableFlatpak # Run automatic tests inside the Flatpak env - - flatpak-builder --run app build-aux/flatpak/org.gnome.NautilusDevel.json ninja -C _build test + - flatpak-builder --run app build-aux/flatpak/org.gnome.Nautilus.json ninja -C _build test artifacts: paths: - nautilus-dev.flatpak diff --git a/build-aux/flatpak/org.gnome.NautilusDevel.json b/build-aux/flatpak/org.gnome.Nautilus.json index 796a8ec62..796a8ec62 100644 --- a/build-aux/flatpak/org.gnome.NautilusDevel.json +++ b/build-aux/flatpak/org.gnome.Nautilus.json |