diff options
-rw-r--r-- | .gitlab-ci.yml | 40 |
1 files changed, 37 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e6e8f2ce2..3f1d7c579 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -121,11 +121,45 @@ flatpak:master: image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master stage: cross_environment variables: - MANIFEST_PATH: "build-aux/flatpak/org.gnome.Nautilus-master.yml" - MESON_ARGS: "-Dprofile=development -Dtests=all" + MANIFEST_PATH: "build-aux/flatpak/org.gnome.NautilusMaster.yml" + MESON_ARGS: "-Dprofile=Master -Dtests=all" FLATPAK_MODULE: "nautilus" RUNTIME_REPO: "https://sdk.gnome.org/gnome-nightly.flatpakrepo" - DBUS_ID: "org.gnome.NautilusDevel" + DBUS_ID: "org.gnome.NautilusMaster" + + script: + - flatpak-builder --stop-at=${FLATPAK_MODULE} app ${MANIFEST_PATH} + # 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 build app meson --prefix=/app --libdir=lib ${MESON_ARGS} _build + - flatpak build app ninja -C _build install + - flatpak-builder --finish-only --repo=repo app ${MANIFEST_PATH} + # Run automatic tests inside the Flatpak env + - xvfb-run -a -s "-screen 0 1024x768x24" flatpak build app ninja -C _build test + # Generate a Flatpak bundle + - flatpak build-bundle repo ${BUNDLE} --runtime-repo=${RUNTIME_REPO} ${DBUS_ID} + artifacts: + paths: + - ${BUNDLE} + - _build/meson-logs/ + expire_in: 30 days + cache: + paths: + - .flatpak-builder/cache + only: + - schedules + - web + - tags + +flatpak:gtk4: + image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master + stage: cross_environment + variables: + MANIFEST_PATH: "build-aux/flatpak/org.gnome.NautilusGtk4.yml" + MESON_ARGS: "-Dprofile=Gtk4 -Dtests=all" + FLATPAK_MODULE: "nautilus" + RUNTIME_REPO: "https://sdk.gnome.org/gnome-nightly.flatpakrepo" + DBUS_ID: "org.gnome.NautilusGtk4" script: - flatpak-builder --stop-at=${FLATPAK_MODULE} app ${MANIFEST_PATH} |