Reverted cache changes, fixed package artifacts

2022-08-23 20:35:30 +02:00 · 2022-08-23 20:35:30 +02:00 · 6ba6c36151
commit 6ba6c36151
parent 420fe10a9e
1 changed files with 10 additions and 8 deletions
--- 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/