[citemplates] Revert "Merge branch 'abderrahim/cache' into 'master'"

[Jordan Petridis <jpetridis src gnome org>]

commit 609e1a31adc7fd6c1c0c3bc39a107f281bc56fd5
Author: Jordan Petridis <jpetridis gnome org>
Date:   Fri Jun 5 20:59:49 2020 +0300

    Revert "Merge branch 'abderrahim/cache' into 'master'"
    
    This reverts commit 185f1349345bdaaf7c329f71bea958686742a8c9, reversing
    changes made to 3431aaa994e14c1756412c821dccc9e6c15bdd95.

 flatpak/flatpak_ci_initiative.yml | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)
---
diff --git a/flatpak/flatpak_ci_initiative.yml b/flatpak/flatpak_ci_initiative.yml
index d5576be..2a55e87 100644
--- a/flatpak/flatpak_ci_initiative.yml
+++ b/flatpak/flatpak_ci_initiative.yml
@@ -4,11 +4,9 @@
   interruptible: true
   tags:
     - flatpak
-  variables:
-    FLATPAK_BUILDER: flatpak-builder --user --disable-rofiles-fuse --state-dir=$HOME/.flatpak-builder
   script:
     - rewrite-flatpak-manifest ${MANIFEST_PATH} ${FLATPAK_MODULE}
-    - ${FLATPAK_BUILDER} flatpak_app --repo=repo ${BRANCH:+--default-branch=$BRANCH} ${MANIFEST_PATH} 
${CONFIG_OPTS}
+    - flatpak-builder --user --disable-rofiles-fuse flatpak_app --repo=repo 
${BRANCH:+--default-branch=$BRANCH} ${MANIFEST_PATH} ${CONFIG_OPTS}
     # Generate a Flatpak bundle
     - flatpak build-bundle repo ${BUNDLE} --runtime-repo=${RUNTIME_REPO} ${APP_ID} ${BRANCH}
     - tar cf repo.tar repo/
@@ -16,11 +14,11 @@
     # Run automatic tests inside the Flatpak env
     # we need to recreate the build directory because cleanup would have deleted build dependencies
     - rm -rf flatpak_app
-    - ${FLATPAK_BUILDER} --build-only flatpak_app ${MANIFEST_PATH}
+    - flatpak-builder --user --disable-rofiles-fuse --build-only flatpak_app ${MANIFEST_PATH}
     - flatpak build-finish --socket=x11 --share=network flatpak_app
     - >
       xvfb-run -a -s "-screen 0 1024x768x24"
-      ${FLATPAK_BUILDER} --build-shell=${FLATPAK_MODULE} flatpak_app ${MANIFEST_PATH} <<END
+      flatpak-builder --user --disable-rofiles-fuse --build-shell=${FLATPAK_MODULE} flatpak_app 
${MANIFEST_PATH} <<END
 
       LANG=C.UTF-8
       NO_AT_BRIDGE=1
@@ -36,14 +34,14 @@
     paths:
       - "${BUNDLE}"
       - 'repo.tar'
-      - '$HOME/.flatpak-builder/build/${FLATPAK_MODULE}/_flatpak_build/meson-logs/meson-log.txt'
-      - '$HOME/.flatpak-builder/build/${FLATPAK_MODULE}/_flatpak_build/meson-logs/testlog.txt'
+      - '.flatpak-builder/build/${FLATPAK_MODULE}/_flatpak_build/meson-logs/meson-log.txt'
+      - '.flatpak-builder/build/${FLATPAK_MODULE}/_flatpak_build/meson-logs/testlog.txt'
     expire_in: 14 days
   cache:
     key: "$CI_JOB_NAME"
     paths:
-      - '$HOME/.flatpak-builder/downloads'
-      - '$HOME/.flatpak-builder/git'
+      - '.flatpak-builder/downloads'
+      - '.flatpak-builder/git'
 
 .review:
   stage: 'deploy'