From 857d877efa5e2548504264bb549bd0d17ab90d64 Mon Sep 17 00:00:00 2001
From: Darren Clarke <darren@redaranj.com>
Date: Fri, 20 Dec 2024 09:49:29 +0100
Subject: [PATCH] CI updates

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index def9374..3485461 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,7 @@ build-all:
     TURBO_TEAM: ${TURBO_TEAM}
     ZAMMAD_URL: ${ZAMMAD_URL}
   script:
-    - npm install npm@latest -g
+    - npm install npm@10 -g
     - npm install -g turbo
     - npm ci
     - turbo build
@@ -201,9 +201,10 @@ zammad-docker-build:
     DOCKER_NS: ${CI_REGISTRY}/digiresilience/link/link-stack/zammad
     DOCKERFILE_PATH: ./docker/zammad/Dockerfile
     DOCKER_CONTEXT: ./docker/zammad
-  before_script:
-    - apk --update add nodejs npm
+  # before_script:
+    # - apk --update add nodejs npm
   script:
+    - nvm use 20
     - npm install npm@10 -g
     - npm install -g turbo
     - npm ci
@@ -223,10 +224,11 @@ zammad-standalone-docker-build:
     DOCKER_NS: ${CI_REGISTRY}/digiresilience/link/link-stack/zammad-standalone
     DOCKERFILE_PATH: ./docker/zammad/Dockerfile
     DOCKER_CONTEXT: ./docker/zammad
-  before_script:
-    - apk --update add nodejs npm
+  # before_script:
+  #  - apk --update add nodejs npm
   script:
-    - npm install npm@latest -g
+    - nvm use 20
+    - npm install npm@10 -g
     - npm install -g turbo
     - npm ci
     - turbo build --force --filter @link-stack/zammad-addon-*