[shotwell] ci: Update for new builder config
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [shotwell] ci: Update for new builder config
- Date: Wed, 19 Feb 2020 21:41:43 +0000 (UTC)
commit 33eec14574cad9090c7aa3659530d9a83b029132
Author: Jens Georg <mail jensge org>
Date: Wed Feb 19 22:41:15 2020 +0100
ci: Update for new builder config
.gitlab-ci.yml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eeb1b7c7..ef2204c5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,6 +7,8 @@ variables:
GIT_SUBMODULE_STRATEGY: recursive
flatpak:
+ tags:
+ - flatpak
image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:3.34
stage: test
variables:
@@ -20,14 +22,14 @@ flatpak:
DBUS_ID: "org.gnome.Shotwell"
script:
- - flatpak-builder --stop-at=${FLATPAK_MODULE} app ${MANIFEST_PATH}
+ - flatpak-builder --user --disable-rofiles-fuse --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 ${CONFIGURE_ARGS} _build
- flatpak build app ninja -C _build install
- - flatpak-builder --finish-only --repo=repo app ${MANIFEST_PATH}
+ - flatpak-builder --user --disable-rofiles-fuse --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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]