[polari/ci-test] ci: Simplify cache handling

[Florian Müllner <fmuellner src gnome org>]

commit 4a6467a8796507cde1479ebdbb9ac63afdc6221f
Author: Florian Müllner <fmuellner gnome org>
Date:   Thu Feb 14 23:30:53 2019 +0100

    ci: Simplify cache handling
    
    https://gitlab.gnome.org/GNOME/polari/merge_requests/89

 .gitlab-ci.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 64874c0..6fe456a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -49,8 +49,6 @@ flatpak:
         MESON_ARGS: "-Dsnapshot=true"
         DBUS_ID: "org.gnome.Polari"
 
-    before_script:
-        - tar -xzf cache.tar.gz .flatpak-builder/cache || true
     script:
         - flatpak-builder --stop-at=${FLATPAK_MODULE} app ${MANIFEST_PATH}
         # Make sure to keep this in sync with the Flatpak manifest, all arguments
@@ -62,8 +60,6 @@ flatpak:
         - flatpak build app ninja -C _build test
         # Generate a Flatpak bundle
         - flatpak build-bundle repo ${BUNDLE} --runtime-repo=${RUNTIME_REPO} ${DBUS_ID} ${BRANCH}
-    after_script:
-        - tar -czf cache.tar.gz .flatpak-builder/cache
     <<: *only_default
 
     artifacts:
@@ -73,9 +69,10 @@ flatpak:
             - _build/meson-logs/testlog.txt
         expire_in: 30 days
     cache:
-        key: flatpak-builder
+        key: "$CI_JOB_NAME"
         paths:
-             - cache.tar.gz
+             - .flatpak-builder/downloads
+             - .flatpak-builder/git
 
 review:
     stage: review