Merge branch 'feature-3.6.0' into feature-3.6.0

kyonRay · Nov 21, 2023 · 0a49ebc · 0a49ebc
2 parents 9755b59 + 8aca2f7
commit 0a49ebc
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/.github/workflows/workflow-self-hosted-arm.yml b/.github/workflows/workflow-self-hosted-arm.yml
@@ -82,7 +82,7 @@ jobs:
         run: cd tools && bash .ci/rpcapi_ci_prepare.sh
 
       - name: FISCO BCOS RpcApiTest
-        uses: matt-ball/newman-action@master
+        uses: matt-ball/newman-action@v1.0.4
         with:
           collection: https://raw.githubusercontent.com/FISCO-BCOS/FISCOBCOS-RPC-API/main/fiscobcos.rpcapi.collection.json
 

diff --git a/.github/workflows/workflow-self-hosted-centos.yml b/.github/workflows/workflow-self-hosted-centos.yml
@@ -104,7 +104,7 @@ jobs:
         run: cd tools && bash .ci/rpcapi_ci_prepare.sh
 
       - name: FISCO BCOS RpcApiTest
-        uses: matt-ball/newman-action@master
+        uses: matt-ball/newman-action@v1.0.4
         with:
           collection: https://raw.githubusercontent.com/FISCO-BCOS/FISCOBCOS-RPC-API/main/fiscobcos.rpcapi.collection.json
 

diff --git a/.github/workflows/workflow-self-hosted-mac.yml b/.github/workflows/workflow-self-hosted-mac.yml
@@ -40,7 +40,7 @@ jobs:
 
       - name: Remove cache if correspond dir change
         run: ./tools/.ci/clear_build_cache.sh
-            
+
       - name: Build for mac
         run: |
           mkdir -p build && cd build && rm -rf  CMakeCache.txt
@@ -51,6 +51,14 @@ jobs:
         run: |
           cd build
           CTEST_OUTPUT_ON_FAILURE=TRUE make test
+          
+      - name: prepare RPCAPI Tests
+        run: cd tools && bash .ci/rpcapi_ci_prepare.sh
+
+      - name: FISCO BCOS RpcApiTest
+        uses: matt-ball/[email protected]
+        with:
+          collection: https://raw.githubusercontent.com/FISCO-BCOS/FISCOBCOS-RPC-API/main/fiscobcos.rpcapi.collection.json
 
       - name: Integration test - Air
         run: cd tools && bash .ci/ci_check_air.sh ${{ github.base_ref }}

diff --git a/.github/workflows/workflow-self-hosted-ubuntu.yml b/.github/workflows/workflow-self-hosted-ubuntu.yml
@@ -87,7 +87,7 @@ jobs:
         run: cd tools && bash .ci/rpcapi_ci_prepare.sh
 
       - name: FISCO BCOS RpcApiTest
-        uses: matt-ball/newman-action@master
+        uses: matt-ball/newman-action@v1.0.4
         with:
           collection: https://raw.githubusercontent.com/FISCO-BCOS/FISCOBCOS-RPC-API/main/fiscobcos.rpcapi.collection.json