[retro-gtk] ci: Make unprivileged

[Adrien Plazas <aplazas src gnome org>]

commit 37308fed7af20a5c50ee9fd3454bf9f0a9ba8bf1
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Thu Feb 20 01:49:41 2020 +0500

    ci: Make unprivileged
    
    See https://mail.gnome.org/archives/desktop-devel-list/2020-February/msg00055.html

 .gitlab-ci.yml | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f1ab8dc..d345391 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,24 +29,25 @@ variables:
 flatpak:tests:
   image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
   stage: test
+  tags:
+    - flatpak
   variables:
     MANIFEST_PATH: "flatpak/org.gnome.Retro.UnitTests.json"
     FLATPAK_MODULE: "retro-gtk"
     FLATPAK_BUILD_DIR: "unit-tests"
     MESON_ARGS: "--libdir=lib -Dinstall-tests=true -Dpulseaudio=disabled"
   script:
-    - flatpak-builder --stop-at=${FLATPAK_MODULE} ${FLATPAK_BUILD_DIR} ${MANIFEST_PATH}
-    - flatpak build ${FLATPAK_BUILD_DIR} meson --prefix=/app ${MESON_ARGS} _build
-    - flatpak build ${FLATPAK_BUILD_DIR} ninja -C _build install
-    - flatpak-builder --finish-only --repo=repo ${FLATPAK_BUILD_DIR} ${MANIFEST_PATH}
-    - xvfb-run -a -s "-screen 0 1024x768x24" flatpak-builder --run unit-tests ${MANIFEST_PATH} 
retro-unit-tests
-  cache:
-    paths:
-      - .flatpak-builder/cache/
+    - flatpak-builder --user --disable-rofiles-fuse --stop-at=${FLATPAK_MODULE} ${FLATPAK_BUILD_DIR} 
${MANIFEST_PATH}
+    - flatpak build ${FLATPAK_BUILD_DIR} meson --prefix=/app ${MESON_ARGS} _build_tests
+    - flatpak build ${FLATPAK_BUILD_DIR} ninja -C _build_tests install
+    - flatpak-builder --user --disable-rofiles-fuse --finish-only --repo=repo ${FLATPAK_BUILD_DIR} 
${MANIFEST_PATH}
+    - xvfb-run -a -s "-screen 0 1024x768x24" flatpak-builder --disable-rofiles-fuse --run unit-tests 
${MANIFEST_PATH} retro-unit-tests
 
 flatpak:demo:
   image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
   stage: build
+  tags:
+    - flatpak
   variables:
     MANIFEST_PATH: "flatpak/org.gnome.Retro.DemoSamplesTest.json"
     RUNTIME_REPO: "https://sdk.gnome.org/gnome-nightly.flatpakrepo";
@@ -54,19 +55,16 @@ flatpak:demo:
     FLATPAK_BUILD_DIR: "app"
     MESON_ARGS: ""
   script:
-    - flatpak-builder --stop-at=${FLATPAK_MODULE} ${FLATPAK_BUILD_DIR} ${MANIFEST_PATH}
+    - flatpak-builder --user --disable-rofiles-fuse --stop-at=${FLATPAK_MODULE} ${FLATPAK_BUILD_DIR} 
${MANIFEST_PATH}
     - flatpak build ${FLATPAK_BUILD_DIR} meson --prefix=/app ${MESON_ARGS} _build
     - flatpak build ${FLATPAK_BUILD_DIR} ninja -C _build install
-    - flatpak-builder --finish-only --repo=repo ${FLATPAK_BUILD_DIR} ${MANIFEST_PATH}
+    - flatpak-builder --user --disable-rofiles-fuse --finish-only --repo=repo ${FLATPAK_BUILD_DIR} 
${MANIFEST_PATH}
     - flatpak build-bundle repo ${BUNDLE} --runtime-repo=${RUNTIME_REPO} org.gnome.Retro.DemoSamplesTest
   artifacts:
     paths:
       - ${BUNDLE}
       - _build/meson-logs/meson-log.txt
     expire_in: 2 days
-  cache:
-    paths:
-      - .flatpak-builder/cache/
 
 review:
   stage: review