From 9ee2df005ae600e805d330416510d847d8e2227f Mon Sep 17 00:00:00 2001
From: Bixilon <bixilon@bixilon.de>
Date: Mon, 14 Nov 2022 11:48:30 +0100
Subject: [PATCH] gitlab ci: properly cache dependencies

---
 .gitlab-ci.yml | 37 ++++++++++++++-----------------------
 1 file changed, 14 insertions(+), 23 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fa09c722a..955ab0916 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,28 +6,31 @@ variables:
 before_script:
   - export GRADLE_USER_HOME=`pwd`/.gradle
 
-cache:
-  paths:
-    - .gradle/wrapper
-    - .gradle/caches
-
 stages:
   - build
   - test
   - package
 
+
+cache:
+  - key: "$CI_COMMIT_REF_NAME"
+    policy: push
+    paths:
+      - build
+  - key:
+      files:
+        - "*gradle/**"
+        - "**.kts"
+    policy: pull-push
+    paths:
+      - .gradle
+
 build:
   stage: build
   script: ./gradlew --build-cache assemble
   only:
     - master
     - merge_requests
-  cache:
-    key: "$CI_COMMIT_REF_NAME"
-    policy: push
-    paths:
-      - build
-      - .gradle
 
 test:
   stage: test
@@ -39,12 +42,6 @@ test:
     when: always
     reports:
       junit: build/test-results/**/TEST-*.xml
-  cache:
-    key: "$CI_COMMIT_REF_NAME"
-    policy: pull
-    paths:
-      - build
-      - .gradle
 
 package:
   stage: package
@@ -55,9 +52,3 @@ package:
   artifacts:
     paths:
       - build/libs/minosoft-fat-*.jar
-  cache:
-    key: "$CI_COMMIT_REF_NAME"
-    policy: pull
-    paths:
-      - build
-      - .gradle