[totem/wip/hadess/bug-fixes: 1/3] ci: Update from Flatpak manifest
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [totem/wip/hadess/bug-fixes: 1/3] ci: Update from Flatpak manifest
- Date: Fri, 8 Feb 2019 10:06:47 +0000 (UTC)
commit d134c9dc3af30b6f9fca552c3132ba75b1315a06
Author: Bastien Nocera <hadess hadess net>
Date: Thu Feb 7 22:08:15 2019 +0100
ci: Update from Flatpak manifest
Note that we still disable vala even though disabling parallel make
should make it build properly as that doesn't work here (but works in
Flathub).
.gitlab-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d853be105..127f033ff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,7 +33,7 @@ flatpak:
FLATPAK_MODULE: "totem"
# Make sure to keep this in sync with the Flatpak manifest, all arguments
# are passed except the config-args because we build it ourselves
- MESON_ARGS: "-Denable-vala=no"
+ MESON_ARGS: "-Denable-vala=no -Denable-easy-codec-installation=no"
DBUS_ID: "org.gnome.Totem"
script:
@@ -41,7 +41,7 @@ flatpak:
# 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 ${MESON_ARGS} _build
- - flatpak build app ninja -C _build install
+ - flatpak build app ninja -j1 -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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]