make e2e npm installs separate steps

superdesk · Feb 4, 2025 · 35fa756 · 35fa756
1 parent 3d7c3ec
commit 35fa756
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/ci-e2e.yml b/.github/workflows/ci-e2e.yml
@@ -12,7 +12,7 @@ jobs:
         node-version: ['14']
         e2e: ['a', 'b']
     env:
-      INSTALL_NODE_MODULES: true
+      INSTALL_NODE_MODULES: false
       RUN_SERVICES: true
       E2E: true
       TZ: Australia/Sydney
@@ -28,6 +28,12 @@ jobs:
           cache-dependency-path: 'server/requirements.txt'
       - name: Setup Environment
         run: ./scripts/ci-install.sh
+      - name: Install Planning Client
+        run: npm ci
+        working-directory: ./
+      - name: Install E2E Client
+        run: npm install
+        working-directory: ./e2e
       - name: Build Client
         working-directory: ./e2e
         run: npm run build

diff --git a/scripts/ci-install.sh b/scripts/ci-install.sh
@@ -7,8 +7,9 @@ sudo apt-get -y install libxml2-dev libxmlsec1-dev libxmlsec1-openssl
 # Update python core packages
 python -m pip install --upgrade pip wheel setuptools
 
+git config --global url."https://git@".insteadOf git://
+
 if [ "$INSTALL_NODE_MODULES" == "true" ]; then
-    git config --global url."https://git@".insteadOf git://
     npm install
 fi
 
@@ -24,6 +25,4 @@ if [ "$E2E" == "true" ]; then
     cd e2e/server
     pip install -r requirements.txt
     cd ../
-    git config --global url."https://git@".insteadOf git://
-    npm install
 fi