Don't fail if install npm target version fails. (#14274)

jhipster · Mar 12, 2021 · 885ec8a · 885ec8a
1 parent ac70eb6
commit 885ec8a
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 11 deletions.
diff --git a/.github/workflows/angular.yml b/.github/workflows/angular.yml
@@ -240,8 +240,6 @@ jobs:
             ${{ runner.os }}-cypress-
       - name: 'ENV: display variables'
         run: $JHI_SCRIPTS/01-display-configuration.sh
-      - name: 'TOOLS: install required npm'
-        run: npm install -g npm@$(node -e "console.log(require('./generators/generator-constants').NPM_VERSION);")
       - name: 'TOOLS: configure tools installed by the system'
         run: $JHI_SCRIPTS/03-system.sh
       - name: 'TOOLS: configure git'

diff --git a/.github/workflows/incremental-changelog.yml b/.github/workflows/incremental-changelog.yml
@@ -148,8 +148,6 @@ jobs:
             ${{ runner.os }}-e2e-${{ matrix.app-type }}-
       - name: 'ENV: display variables'
         run: $JHI_SCRIPTS/01-display-configuration.sh
-      - name: 'TOOLS: install required npm'
-        run: npm install -g npm@$(node -e "console.log(require('./generators/generator-constants').NPM_VERSION);")
       - name: 'TOOLS: configure tools installed by the system'
         run: $JHI_SCRIPTS/03-system.sh
       - name: 'TOOLS: configure git'

diff --git a/.github/workflows/react.yml b/.github/workflows/react.yml
@@ -222,8 +222,6 @@ jobs:
             ${{ runner.os }}-cypress-
       - name: 'ENV: display variables'
         run: $JHI_SCRIPTS/01-display-configuration.sh
-      - name: 'TOOLS: install required npm'
-        run: npm install -g npm@$(node -e "console.log(require('./generators/generator-constants').NPM_VERSION);")
       - name: 'TOOLS: configure tools installed by the system'
         run: $JHI_SCRIPTS/03-system.sh
       - name: 'TOOLS: configure git'

diff --git a/.github/workflows/vue.yml b/.github/workflows/vue.yml
@@ -220,8 +220,6 @@ jobs:
             ${{ runner.os }}-cypress-
       - name: 'ENV: display variables'
         run: $JHI_SCRIPTS/01-display-configuration.sh
-      - name: 'TOOLS: install required npm'
-        run: npm install -g npm@$(node -e "console.log(require('./generators/generator-constants').NPM_VERSION);")
       - name: 'TOOLS: configure tools installed by the system'
         run: $JHI_SCRIPTS/03-system.sh
       - name: 'TOOLS: configure git'

diff --git a/.github/workflows/webflux.yml b/.github/workflows/webflux.yml
@@ -226,8 +226,6 @@ jobs:
             ${{ runner.os }}-cypress-
       - name: 'ENV: display variables'
         run: $JHI_SCRIPTS/01-display-configuration.sh
-      - name: 'TOOLS: install required npm'
-        run: npm install -g npm@$(node -e "console.log(require('./generators/generator-constants').NPM_VERSION);")
       - name: 'TOOLS: configure tools installed by the system'
         run: $JHI_SCRIPTS/03-system.sh
       - name: 'TOOLS: configure git'

diff --git a/test-integration/scripts/10-install-jhipster.sh b/test-integration/scripts/10-install-jhipster.sh
@@ -47,7 +47,7 @@ if [[ "$JHI_REPO" == *"/generator-jhipster" ]]; then
 
     cd "$JHI_HOME"
     git --no-pager log -n 10 --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
-    npm install -g npm@$(node -e "console.log(require('./generators/generator-constants').NPM_VERSION);")
+    npm install -g npm@$(node -e "console.log(require('./generators/generator-constants').NPM_VERSION);") || true
     npm ci
     npm install -g "$JHI_HOME"
 elif [[ "$JHI_GEN_BRANCH" == "release" ]]; then