Address review comments

* Define NPM version once in workflow Signed-off-by: CaptainIRS <[email protected]>
hyperledger-caliper · Jul 22, 2022 · ff2a2dc · ff2a2dc
1 parent c9ac88b
commit ff2a2dc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -3,6 +3,9 @@ name: Integration Tests
 on:
   workflow_call:
 
+env:
+  NPM_VERSION: 8.15.0
+
 jobs:
   fabric-integration-tests:
     name: Fabric Integration Tests
@@ -17,7 +20,7 @@ jobs:
       with:
         node-version: ${{ matrix.node-version }}
     - name: Install higher version of NPM
-      run: npm install -g npm@8.15.0
+      run: npm install -g npm@${{ env.NPM_VERSION }}
     - name: Fabric Integration Test
       run: .build/benchmark-integration-test-direct.sh
       env:
@@ -36,7 +39,7 @@ jobs:
       with:
         node-version: ${{ matrix.node-version }}
     - name: Install higher version of NPM
-      run: npm install -g npm@8.15.0
+      run: npm install -g npm@${{ env.NPM_VERSION }}
     - name: Ethereum Integration Test
       run: .build/benchmark-integration-test-direct.sh
       env:
@@ -55,7 +58,7 @@ jobs:
       with:
         node-version: ${{ matrix.node-version }}
     - name: Install higher version of NPM
-      run: npm install -g npm@8.15.0
+      run: npm install -g npm@${{ env.NPM_VERSION }}
     - name: Besu Integration Test
       run: .build/benchmark-integration-test-direct.sh
       env:
@@ -74,7 +77,7 @@ jobs:
       with:
         node-version: ${{ matrix.node-version }}
     - name: Install higher version of NPM
-      run: npm install -g npm@8.15.0
+      run: npm install -g npm@${{ env.NPM_VERSION }}
     - name: FISCO BCOS Integration Test
       run: .build/benchmark-integration-test-direct.sh
       env:
@@ -93,7 +96,7 @@ jobs:
       with:
         node-version: ${{ matrix.node-version }}
     - name: Install higher version of NPM
-      run: npm install -g npm@8.15.0
+      run: npm install -g npm@${{ env.NPM_VERSION }}
     - name: Generator Integration Test
       run: .build/benchmark-integration-test-direct.sh
       env:

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -3,6 +3,9 @@ name: Unit Tests
 on:
   workflow_call:
 
+env:
+  NPM_VERSION: 8.15.0
+
 jobs:
   unit-tests:
     name: Unit Tests
@@ -17,7 +20,7 @@ jobs:
       with:
         node-version: ${{ matrix.node-version }}
     - name: Install higher version of NPM
-      run: npm install -g npm@8.15.0
+      run: npm install -g npm@${{ env.NPM_VERSION }}
     - name: Check correct usage of Caliper package names
       run: ./scripts/check-package-names.sh
     - name: Install project dependencies