move builds to newer versions

Signed-off-by: Dave Kelsey <d_kelsey@uk.ibm.com>
hyperledger · May 3, 2024 · ee26fd9 · ee26fd9
1 parent e34bb84
commit ee26fd9
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 27 deletions.
diff --git a/.github/workflows/besu-tests.yaml b/.github/workflows/besu-tests.yaml
@@ -1,17 +1,18 @@
 name: Besu Tests
 
 on:
-  push:
-    paths:
-      - 'benchmarks/scenario/ERC-20/**'
-      - 'benchmarks/scenario/ERC-721/**'
-      - 'benchmarks/scenario/simple/**'
-      - 'networks/besu/1node-clique/**'
-      - 'src/ethereum/ERC-20/**'
-      - 'src/ethereum/ERC-721/**'
-      - 'src/ethereum/simple/**'
+#  push:
+#    paths:
+#      - 'benchmarks/scenario/ERC-20/**'
+#      - 'benchmarks/scenario/ERC-721/**'
+#      - 'benchmarks/scenario/simple/**'
+#      - 'networks/besu/1node-clique/**'
+#      - 'src/ethereum/ERC-20/**'
+#      - 'src/ethereum/ERC-721/**'
+#      - 'src/ethereum/simple/**'
   pull_request:
     paths:
+      - '.github/workflows/besu-tests.yaml'
       - 'benchmarks/scenario/ERC-20/**'
       - 'benchmarks/scenario/ERC-721/**'
       - 'benchmarks/scenario/simple/**'
@@ -24,19 +25,19 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4.1.4
 
     - name: Setup Node.js environment
-      uses: actions/setup-node@v2.3.1
+      uses: actions/setup-node@v4.0.2
       with:
-        node-version: '14'
+        node-version: '20'
 
-    - name: Install dependencies
-      run: npm install
+#    - name: Install dependencies
+#      run: npm install
 
     - name: Run commands
       run: |
-        npm install --only=prod @hyperledger/caliper-cli@0.5.0
+        npm install --only=prod @hyperledger/caliper-cli@0.6.0
         npx caliper bind --caliper-bind-sut besu:latest
         npx caliper --version
         npx caliper launch manager \

diff --git a/.github/workflows/fabric-tests.yaml b/.github/workflows/fabric-tests.yaml
@@ -5,9 +5,9 @@ on:
     branches: [ main ]
 
 env:
-  FABRIC_VERSION: 2.4.3
-  CALIPER_VERSION: 0.5.0
-  FABRIC_BIND_SUT: 2.2
+  FABRIC_VERSION: 2.5.7
+  CALIPER_VERSION: 0.6.0
+  FABRIC_BIND_SUT: fabric-gateway
 
 jobs:
   changes:
@@ -17,7 +17,7 @@ jobs:
       benchmark: ${{ steps.benchmarks-filter.outputs.changes }}
       cc-env: ${{ steps.cc-env-filter.outputs.changes }}
     steps:
-    - uses: dorny/paths-filter@v2
+    - uses: dorny/paths-filter@v3.0.2
       name: Check for changes in benchmarks
       id: benchmarks-filter
       with:
@@ -50,7 +50,7 @@ jobs:
             - 'networks/fabric/**'
             - 'networks/prometheus-grafana/**'
             - '.github/**'
-    - uses: dorny/paths-filter@v2
+    - uses: dorny/paths-filter@v3.0.2
       name: Check for changes in chaincode environments
       id: cc-env-filter
       with:
@@ -84,7 +84,7 @@ jobs:
     steps:
     - name: Cache node modules
       id: cache-npm
-      uses: actions/cache@v2
+      uses: actions/cache@v4.0.2
       with:
         path: node_modules
         key: ${{ matrix.node-version }}-npm-cache-${{ env.CALIPER_VERSION }}-${{ env.FABRIC_BIND_SUT }}
@@ -98,7 +98,7 @@ jobs:
         npx caliper --version
     - name: Cache Fabric Samples and Binaries
       id: cache-fabric
-      uses: actions/cache@v2
+      uses: actions/cache@v4.0.2
       with:
         path: fabric-samples
         key: ${{ runner.os }}-fabric-samples-${{ env.FABRIC_VERSION }}
@@ -129,21 +129,21 @@ jobs:
           - cc-env: java
             benchmark: smallbank
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-node@v2
+    - uses: actions/checkout@v4.1.4
+    - uses: actions/setup-node@v4.0.2
       with:
-        node-version: 16.x
+        node-version: 20.x
     - name: Cache node modules
       id: cache-npm
-      uses: actions/cache@v2
+      uses: actions/cache@v4.0.2
       with:
         path: node_modules
         key: ${{ matrix.node-version }}-npm-cache-${{ env.CALIPER_VERSION }}-${{ env.FABRIC_BIND_SUT }}
         restore-keys: |
           ${{ matrix.node-version }}-npm-cache-
     - name: Cache Fabric Samples and Binaries
       id: cache-fabric
-      uses: actions/cache@v2
+      uses: actions/cache@v4.0.2
       with:
         path: fabric-samples
         key: ${{ runner.os }}-fabric-samples-${{ env.FABRIC_VERSION }}