fix up to reenable fabric 3.0 test (#413)

* fix up to reenable fabric 3.0 test Signed-off-by: Sam Yuan <yy19902439@126.com> * fix up Signed-off-by: Sam Yuan <yy19902439@126.com> --------- Signed-off-by: Sam Yuan <yy19902439@126.com>
Hyperledger-TWGC · Sep 19, 2024 · b62f589 · b62f589
1 parent 2f3704f
commit b62f589
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -20,20 +20,20 @@ jobs:
         name: install tape to GOBIN
       - run: make unit-test
         name: run unit test
-  integration-test-1412:
-    runs-on: ubuntu-latest
-    needs: unit-test
-    strategy:
-      matrix:
-        FABRIC_VERSION: [1_4]
-        INTERGATION_CASE: [ANDLogic]
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
-        with:
-          go-version-file: go.mod
-      - run: go mod vendor
-      - run: make integration-test FABRIC_VERSION=${{matrix.FABRIC_VERSION}} INTERGATION_CASE=${{matrix.INTERGATION_CASE}}
+  #integration-test-1412:
+  #  runs-on: ubuntu-latest
+  #  needs: unit-test
+  #  strategy:
+  #    matrix:
+  #      FABRIC_VERSION: [1_4]
+  #      INTERGATION_CASE: [ANDLogic]
+  #  steps:
+  #    - uses: actions/checkout@v4
+  #    - uses: actions/setup-go@v5
+  #      with:
+  #         go-version: 1.22
+  #    - run: go mod vendor
+  #    - run: make integration-test FABRIC_VERSION=${{matrix.FABRIC_VERSION}} INTERGATION_CASE=${{matrix.INTERGATION_CASE}}
   integration-test:
     runs-on: ubuntu-latest
     needs: unit-test
@@ -59,6 +59,6 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version-file: go.mod
+          go-version: 1.22
       - run: go mod vendor
       - run: make integration-test FABRIC_VERSION=${{matrix.FABRIC_VERSION}} INTERGATION_CASE=${{matrix.INTERGATION_CASE}}
diff --git a/test/integration-test.sh b/test/integration-test.sh
@@ -92,7 +92,7 @@ case $1 in
     ;;
  3_0)
       curl -sSLO https://raw.githubusercontent.com/hyperledger/fabric/main/scripts/install-fabric.sh && chmod +x install-fabric.sh
-      ./install-fabric.sh --fabric-version 3.0.0-preview
+      ./install-fabric.sh --fabric-version 3.0.0-rc1
       cd fabric-samples/test-network
       echo y |  ./network.sh up createChannel -bft -c mychannel
       ARGS=(-cci initLedger)