Fix CI pipeline

Concordium · Nov 19, 2024 · c9e0cf4 · c9e0cf4
1 parent 2f0f32c
commit c9e0cf4
Show file tree

Hide file tree

Showing 7 changed files with 1,663 additions and 782 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,7 +18,6 @@ node_modules
 .env.development.local
 .env.test.local
 .env.production.local
-.yarn
 .vite
 /**/.vscode
 

diff --git a/compliant-reward-distribution/dockerfiles/server.Dockerfile b/compliant-reward-distribution/dockerfiles/server.Dockerfile
@@ -5,6 +5,10 @@ ARG NODE_IMAGE=node:18-slim
 
 # Build frontend
 FROM ${NODE_IMAGE} AS frontend
+
+# Enable Corepack and prepare Yarn 3.6.3
+RUN corepack enable && corepack prepare [email protected] --activate
+
 WORKDIR /frontend
 COPY ./compliant-reward-distribution/frontend ./
 RUN yarn

diff --git a/compliant-reward-distribution/frontend/.yarn/releases/yarn-3.6.3.cjs b/compliant-reward-distribution/frontend/.yarn/releases/yarn-3.6.3.cjs
diff --git a/compliant-reward-distribution/frontend/.yarnrc.yml b/compliant-reward-distribution/frontend/.yarnrc.yml
@@ -1 +1,2 @@
+yarnPath: .yarn/releases/yarn-3.6.3.cjs
 nodeLinker: node-modules
diff --git a/compliant-reward-distribution/frontend/package.json b/compliant-reward-distribution/frontend/package.json
@@ -2,7 +2,7 @@
     "name": "compliance-reward-distribution-front-end",
     "version": "1.0.0",
     "type": "module",
-    "packageManager": "yarn@4.5.0",
+    "packageManager": "yarn@3.6.3",
     "scripts": {
         "dev": "vite",
         "build": "tsc && vite build && cp -r ./public ./dist/",

diff --git a/compliant-reward-distribution/frontend/yarn.lock b/compliant-reward-distribution/frontend/yarn.lock
diff --git a/sponsoredTransactionsAuction/Dockerfile b/sponsoredTransactionsAuction/Dockerfile
@@ -12,6 +12,9 @@ COPY ./sponsoredTransactionsAuction/frontend/src ./src
 COPY ./sponsoredTransactionsAuction/frontend/index.html ./index.html
 COPY ./sponsoredTransactionsAuction/frontend/generated ./generated
 
+# Enable Corepack and prepare Yarn 3.6.3
+RUN corepack enable && corepack prepare [email protected] --activate
+
 RUN yarn
 RUN yarn build
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		yarnPath: .yarn/releases/yarn-3.6.3.cjs
		nodeLinker: node-modules