Cache corepack resources

Signed-off-by: Marvin A. Ruder <signed@mruder.dev>
marvinruder · Feb 29, 2024 · f8958f8 · f8958f8
1 parent 1b865e1
commit f8958f8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -55,8 +55,8 @@ node('rating-tracker-build') {
                             sh """
                             echo \"enableInlineBuilds: true\" >> .yarnrc.yml
                             echo \"globalFolder: /workdir/cache/yarn/global\" >> .yarnrc.yml
-                            mkdir -p \$HOME/.cache/yarn \$HOME/.cache/prisma ./cache
-                            cp -arln \$HOME/.cache/yarn \$HOME/.cache/prisma ./cache || :
+                            mkdir -p \$HOME/.cache/yarn \$HOME/.cache/node \$HOME/.cache/prisma ./cache
+                            cp -arln \$HOME/.cache/yarn \$HOME/.cache/node \$HOME/.cache/prisma ./cache || :
                             docker build $DOCKER_CI_FLAGS --target=yarn .
                             """
                         }
@@ -125,7 +125,7 @@ node('rating-tracker-build') {
                 stage ('Cleanup') {
                     // Upload cache to external storage and remove build artifacts
                     sh """#!/bin/bash
-                    cp -arln ./cache/yarn ./cache/prisma \$HOME/.cache
+                    cp -arln ./cache/yarn ./cache/node \$HOME/.cache/prisma \$HOME/.cache
                     putcache
                     PGPORT=$PGPORT REDISPORT=$REDISPORT docker compose -p rating-tracker-test-job$JOB_ID -f packages/backend/test/docker-compose.yml down -t 0            
                     docker rmi $IMAGE_NAME:job$JOB_ID-wasm $IMAGE_NAME:job$JOB_ID-ci || :

diff --git a/docker/Dockerfile-ci b/docker/Dockerfile-ci
@@ -137,9 +137,9 @@ WORKDIR /coverage
 # Copy coverage reports from test stage
 COPY --from=test /coverage /coverage
 
-# Add yarn and prisma cache
+# Add caches
+COPY --from=yarn /root/.cache /cache
 COPY --from=yarn /workdir/cache/yarn /cache/yarn
-COPY --from=yarn /root/.cache/prisma /cache/prisma
 
 # Add build artifacts
 COPY --from=build /app /app