ci: Restore ccache, but do not cache it across jobs

The GitLab cache is kept across jobs, whether they succeeded or not:
this means that if a compiler check fails during the Meson
configuration, the small compiler program gets cached and restored the
next time the job is run, thus failing again.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9bae24e751357d9e6ba59e47acd2d66d2eaaf0f5..33d2276de00a561fa378f468d925a840f9b43626 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,7 +10,6 @@ before_script:
 
 cache:
   paths:
-    - _ccache/
     - subprojects/gdk-pixbuf/
     - subprojects/glib/
     - subprojects/graphene/

diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index c940ef6eaf3ea2d8bbe0846f72b53359bbdf118a..2413b81f537fa70346cb458f845b701213f9126f 100644 (file)
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -7,6 +7,7 @@ RUN dnf -y install \
     avahi-gobject-devel \
     cairo-devel \
     cairo-gobject-devel \
+    ccache \
     colord-devel \
     cups-devel \
     desktop-file-utils \