[gnome-notes/wip/igaldino/ci-fix] gitlab-ci: Adhere to GitLab changes



commit f7ad9194fce2541cf25f04ea6c15f01c785dbf32
Author: Isaque Galdino <igaldino gmail com>
Date:   Wed Feb 19 19:50:57 2020 -0300

    gitlab-ci: Adhere to GitLab changes

 .gitlab-ci.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ce2e2a6..f7e352a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,11 +14,12 @@ 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
         # CONFIGURE_ARGS: "-Dtests=all"
+        MESON_ARGS: "-Dflatpak=true -Dprofile=development"
 
     script:
         - git submodule update --init --recursive
-        - flatpak-builder --stop-at=${FLATPAK_MODULE} app ${MANIFEST_PATH}
-        - flatpak build app meson --prefix=/app ${CONFIGURE_ARGS} _build
-        - flatpak build app ninja -C _build install
+        - flatpak-builder --user --disable-rofiles-fuse --stop-at=${FLATPAK_MODULE} flatpak_app 
${MANIFEST_PATH}
+        - flatpak-builder --run --disable-rofiles-fuse flatpak_app meson --prefix=/app ${CONFIGURE_ARGS} 
_build
+        - flatpak-builder --run --disable-rofiles-fuse flatpak_app ninja -C _build install
         # Run tests inside the Flatpak env emulating a display
-        - xvfb-run -a -s "-screen 0 1024x768x24" flatpak build app ninja -C _build test
+        - xvfb-run -a -s "-screen 0 1024x768x24" flatpak-builder --run --disable-rofiles-fuse flatpak_app 
ninja -C _build test


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]