Add npm install step through a script

jhipster · Dec 22, 2020 · a1f6db7 · a1f6db7
1 parent 27c72dc
commit a1f6db7
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/.github/workflows/smoke-test-imperative.yml b/.github/workflows/smoke-test-imperative.yml
@@ -43,6 +43,6 @@ jobs:
             - name: 'Run JHipster Application server tests'
               run: $JHI_SCRIPTS/03-run-server-tests.sh $JHI_APP
             - name: 'Run npm clean install'
-              run: npm ci
+              run: $JHI_SCRIPTS/04-run-npm-install.sh $JHI_APP
             - name: 'Run JHipster Application client tests'
-              run: $JHI_SCRIPTS/04-run-client-tests.sh $JHI_APP
+              run: $JHI_SCRIPTS/05-run-client-tests.sh $JHI_APP
diff --git a/test-integration/scripts/04-run-npm-install.sh b/test-integration/scripts/04-run-npm-install.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+source $(dirname $0)/00-init-env.sh
+
+#-------------------------------------------------------------------------------
+# Launch frontend tests
+#-------------------------------------------------------------------------------
+cd "$JHI_FOLDER_APP"
+    JHI_CLIENT_PACKAGE_MANAGER=npm
+
+if [ -f "tsconfig.json" ]; then
+    $JHI_CLIENT_PACKAGE_MANAGER ci
+fi
diff --git a/...ntegration/scripts/04-run-client-tests.sh → ...ntegration/scripts/05-run-client-tests.sh b/...ntegration/scripts/04-run-client-tests.sh → ...ntegration/scripts/05-run-client-tests.sh