From 5a7583654f971e83fc47ddcf67652def31b63ad4 Mon Sep 17 00:00:00 2001
From: Aditya Toshniwal <aditya.toshniwal@enterprisedb.com>
Date: Thu, 26 Oct 2023 15:17:41 +0530
Subject: [PATCH] Move yarn to berry first before moving to 3.x

---
 .github/workflows/run-javascript-tests.yml | 7 ++++++-
 Dockerfile                                 | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/run-javascript-tests.yml b/.github/workflows/run-javascript-tests.yml
index 6900f2ea0..b61b423bf 100644
--- a/.github/workflows/run-javascript-tests.yml
+++ b/.github/workflows/run-javascript-tests.yml
@@ -22,12 +22,17 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '18.x'
 
       - name: Upgrade yarn
         run: |
+          yarn set version berry
           yarn set version 3
 
+      - uses: actions/checkout@v3
+
       - name: Install Node modules
         run: |
           cd web
diff --git a/Dockerfile b/Dockerfile
index 89c242d0d..1fd807821 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -46,6 +46,7 @@ WORKDIR /pgadmin4/web
 
 # Build the JS vendor code in the app-builder, and then remove the vendor source.
 RUN export CPPFLAGS="-DPNG_ARM_NEON_OPT=0" && \
+    yarn set version berry && \
     yarn set version 3 && \
     yarn install && \
     yarn run bundle && \