From 6ba6c361516951187e85e145ce6f2e40888912c6 Mon Sep 17 00:00:00 2001
From: Matthias <root@mattv.de>
Date: Tue, 23 Aug 2022 20:35:30 +0200
Subject: [PATCH] Reverted cache changes, fixed package artifacts

---
 .gitlab-ci.yml | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b67af9d..43a1a24 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,17 +11,16 @@ cache:
               - yarn.lock
               - frontend/yarn.lock
       paths:
+          - .yarn
           - node_modules
+          - frontend/.yarn
           - frontend/node_modules
 
 before_script:
-    - >
-      if [ ! -d "node_modules" ]; then
-        yarn install
-        cd frontend
-        yarn install
-        cd ..
-      fi
+    - yarn install --cache-folder .yarn --frozen-lockfile
+    - cd frontend
+    - yarn install --cache-folder .yarn --frozen-lockfile
+    - cd ..
 
 test_backend:
     stage: test
@@ -78,4 +77,7 @@ package_server:
         - mv "$TMP/"* .
     artifacts:
         paths:
-            - .
+            - package.json
+            - server.js
+            - yarn.lock
+            - frontend/