From addda57365512f3538ebe15f179d52974ef1f061 Mon Sep 17 00:00:00 2001 From: Sam Yuan Date: Thu, 19 Sep 2024 20:39:40 +0800 Subject: [PATCH 1/2] fix up to reenable fabric 3.0 test Signed-off-by: Sam Yuan --- .github/workflows/test.yml | 2 +- test/integration-test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3ca39841..81c8c32f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -31,7 +31,7 @@ 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}} integration-test: diff --git a/test/integration-test.sh b/test/integration-test.sh index d04cec30..5f9e7a83 100755 --- 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) From 9f26ef1dca0ceeb9b79e472da0f5dd2078ed9d11 Mon Sep 17 00:00:00 2001 From: Sam Yuan Date: Thu, 19 Sep 2024 20:57:40 +0800 Subject: [PATCH 2/2] fix up Signed-off-by: Sam Yuan --- .github/workflows/test.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 81c8c32f..0ef0756c 100644 --- 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: 1.22 - - 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}} \ No newline at end of file