From 3a054d5a90dc57790e2b5cc59befd8c05ee9bbbc Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Wed, 19 Feb 2020 15:04:58 +0000
Subject: [PATCH] ci: Update flatpak jobs

The CI infrastructure was changed to run with fewer privileges, so we
need to adapt our Flatpak jobs to compensate.

See: https://mail.gnome.org/archives/desktop-devel-list/2020-February/msg00055.html
---
 .gitlab-ci.yml              | 2 ++
 .gitlab-ci/flatpak-build.sh | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 49ff3850bb..5d8aea5315 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -116,6 +116,8 @@ msys2-mingw32:
   image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
   stage: flatpak
   allow_failure: true
+  tags:
+    - flatpak
   artifacts:
     paths:
       - "${APPID}-dev.flatpak"
diff --git a/.gitlab-ci/flatpak-build.sh b/.gitlab-ci/flatpak-build.sh
index 9b27b6290e..cbb6c097d1 100644
--- a/.gitlab-ci/flatpak-build.sh
+++ b/.gitlab-ci/flatpak-build.sh
@@ -8,6 +8,7 @@ builddir=flatpak_app
 repodir=repo
 
 flatpak-builder \
+        --user --disable-rofiles-fuse \
         --stop-at=gtk \
         ${builddir} \
         build-aux/flatpak/${appid}.json
@@ -23,11 +24,12 @@ flatpak build ${builddir} meson \
                 -Dbuild-examples=false \
                 -Dintrospection=false \
                 -Ddemos=true \
-                _build .
+                _flatpak_build
 
-flatpak build ${builddir} ninja -C _build install
+flatpak build ${builddir} ninja -C _flatpak_build install
 
 flatpak-builder \
+        --user --disable-rofiles-fuse \
         --finish-only \
         --repo=${repodir} \
         ${builddir} \