From 124adb43f964c4ef62836c547bba851a4d10bfb3 Mon Sep 17 00:00:00 2001 From: jkneubuh <86427252+jkneubuh@users.noreply.github.com> Date: Wed, 18 Jan 2023 11:05:40 -0500 Subject: [PATCH] run test suites with 2.5 binaries and images (#906) * run test suites with 2.5 binaries and images Signed-off-by: Josh Kneubuhl * Swap to use the Helper Function to create policies (#907) The old way used the direct protobuf functions, there is a helper function in the chaincode does exactly that. Signed-off-by: Matthew B White Signed-off-by: Josh Kneubuhl Signed-off-by: Matthew B White Co-authored-by: Matthew B White --- .github/actions/test-network-setup/action.yaml | 13 +++++++++++-- .github/workflows/lint.yaml | 4 ++-- .github/workflows/rest-sample.yaml | 4 ++-- .github/workflows/test-fsat.yaml | 1 + .github/workflows/test-network-basic.yaml | 4 ++-- .github/workflows/test-network-events.yaml | 4 ++-- .github/workflows/test-network-gateway.yaml | 4 ++-- .github/workflows/test-network-hsm.yaml | 4 ++-- .github/workflows/test-network-k8s.yaml | 4 ++-- .github/workflows/test-network-ledger.yaml | 4 ++-- .github/workflows/test-network-off-chain.yaml | 4 ++-- .github/workflows/test-network-private.yaml | 4 ++-- .github/workflows/test-network-sbe.yaml | 4 ++-- .github/workflows/test-network-secured.yaml | 4 ++-- .../chaincode-typescript/package.json | 4 ++-- 15 files changed, 38 insertions(+), 28 deletions(-) diff --git a/.github/actions/test-network-setup/action.yaml b/.github/actions/test-network-setup/action.yaml index ed6587c6..f36169b2 100644 --- a/.github/actions/test-network-setup/action.yaml +++ b/.github/actions/test-network-setup/action.yaml @@ -10,6 +10,12 @@ inputs: java-version: description: Version of JDK default: 11.x + fabric-version: + description: Version of Hyperledger Fabric + default: 2.5.0-alpha3 + ca-version: + description: Version of Hyperledger Fabric CA + default: 1.5.6-beta3 runs: using: "composite" @@ -35,12 +41,15 @@ runs: - name: Install fabric CLI shell: bash run: | - curl -sSL https://raw.githubusercontent.com/hyperledger/fabric/main/scripts/install-fabric.sh | bash -s -- binary + curl -sSL https://raw.githubusercontent.com/hyperledger/fabric/main/scripts/install-fabric.sh \ + | bash -s -- binary --fabric-version ${{ inputs.fabric-version }} --ca-version ${{ inputs.ca-version }} echo ${PWD}/bin >> $GITHUB_PATH - name: Pull Fabric Docker Images shell: bash - run: curl -sSL https://raw.githubusercontent.com/hyperledger/fabric/main/scripts/install-fabric.sh | bash -s -- docker + run: | + curl -sSL https://raw.githubusercontent.com/hyperledger/fabric/main/scripts/install-fabric.sh \ + | bash -s -- docker --fabric-version ${{ inputs.fabric-version }} --ca-version ${{ inputs.ca-version }} - name: Install retry CLI shell: bash diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 4ab1ff67..028fea68 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -7,9 +7,9 @@ run-name: ${{ github.actor }} is linting fabric-samples 🎉 on: workflow_dispatch: push: - branches: [ "main" ] + branches: [ "main", "release-2.5" ] pull_request: - branches: [ "main" ] + branches: [ "main", "release-2.5" ] env: GO_VER: 1.18.3 diff --git a/.github/workflows/rest-sample.yaml b/.github/workflows/rest-sample.yaml index ff8659f8..f2cae6eb 100644 --- a/.github/workflows/rest-sample.yaml +++ b/.github/workflows/rest-sample.yaml @@ -10,10 +10,10 @@ env: on: workflow_dispatch: push: - branches: [ "main" ] + branches: [ "main", "release-2.5" ] paths: [ "asset-transfer-basic/rest-api-typescript/**" ] pull_request: - branches: [ "main" ] + branches: [ "main", "release-2.5" ] paths: [ "asset-transfer-basic/rest-api-typescript/**" ] jobs: diff --git a/.github/workflows/test-fsat.yaml b/.github/workflows/test-fsat.yaml index 934161c6..09d58ec4 100644 --- a/.github/workflows/test-fsat.yaml +++ b/.github/workflows/test-fsat.yaml @@ -6,6 +6,7 @@ on: pull_request: branches: - "main" + - "release-2.5" paths: - "full-stack-asset-transfer-guide/**" diff --git a/.github/workflows/test-network-basic.yaml b/.github/workflows/test-network-basic.yaml index eb20869d..72b7c1db 100644 --- a/.github/workflows/test-network-basic.yaml +++ b/.github/workflows/test-network-basic.yaml @@ -7,9 +7,9 @@ run-name: ${{ github.actor }} is running the Test Network Basic tests 🔎 on: workflow_dispatch: push: - branches: [ "main" ] + branches: [ "main", "release-2.5" ] pull_request: - branches: [ "main" ] + branches: [ "main", "release-2.5" ] jobs: basic: diff --git a/.github/workflows/test-network-events.yaml b/.github/workflows/test-network-events.yaml index a1e3e996..4a6ebd99 100644 --- a/.github/workflows/test-network-events.yaml +++ b/.github/workflows/test-network-events.yaml @@ -7,9 +7,9 @@ run-name: ${{ github.actor }} is running the Test Network Events tests 💡 on: workflow_dispatch: push: - branches: [ "main" ] + branches: [ "main", "release-2.5" ] pull_request: - branches: [ "main" ] + branches: [ "main", "release-2.5" ] jobs: events: diff --git a/.github/workflows/test-network-gateway.yaml b/.github/workflows/test-network-gateway.yaml index a5f195ce..06477397 100644 --- a/.github/workflows/test-network-gateway.yaml +++ b/.github/workflows/test-network-gateway.yaml @@ -7,9 +7,9 @@ run-name: ${{ github.actor }} is running the Test Network Gateway tests 🖥️ on: workflow_dispatch: push: - branches: [ "main" ] + branches: [ "main", "release-2.5" ] pull_request: - branches: [ "main" ] + branches: [ "main", "release-2.5" ] jobs: gateway: diff --git a/.github/workflows/test-network-hsm.yaml b/.github/workflows/test-network-hsm.yaml index 51093488..189a77a1 100644 --- a/.github/workflows/test-network-hsm.yaml +++ b/.github/workflows/test-network-hsm.yaml @@ -7,9 +7,9 @@ run-name: ${{ github.actor }} is running the Test Network HSM tests 🍏 on: workflow_dispatch: push: - branches: [ "main" ] + branches: [ "main", "release-2.5" ] pull_request: - branches: [ "main" ] + branches: [ "main", "release-2.5" ] jobs: hsm: diff --git a/.github/workflows/test-network-k8s.yaml b/.github/workflows/test-network-k8s.yaml index cadb4376..7898e820 100644 --- a/.github/workflows/test-network-k8s.yaml +++ b/.github/workflows/test-network-k8s.yaml @@ -7,9 +7,9 @@ run-name: ${{ github.actor }} is testing the Kubernetes Test Network 🍒 on: workflow_dispatch: push: - branches: [ "main" ] + branches: [ "main", "release-2.5" ] pull_request: - branches: [ "main" ] + branches: [ "main", "release-2.5" ] jobs: ccaas-java: diff --git a/.github/workflows/test-network-ledger.yaml b/.github/workflows/test-network-ledger.yaml index 60c566c9..5bc6669b 100644 --- a/.github/workflows/test-network-ledger.yaml +++ b/.github/workflows/test-network-ledger.yaml @@ -7,9 +7,9 @@ run-name: ${{ github.actor }} is running the Test Network Ledger tests 🥑 on: workflow_dispatch: push: - branches: [ "main" ] + branches: [ "main", "release-2.5" ] pull_request: - branches: [ "main" ] + branches: [ "main", "release-2.5" ] jobs: basic: diff --git a/.github/workflows/test-network-off-chain.yaml b/.github/workflows/test-network-off-chain.yaml index fc10b968..1e5840d4 100644 --- a/.github/workflows/test-network-off-chain.yaml +++ b/.github/workflows/test-network-off-chain.yaml @@ -7,9 +7,9 @@ run-name: ${{ github.actor }} is running the Test Network Off Chain tests 🍔 on: workflow_dispatch: push: - branches: [ "main" ] + branches: [ "main", "release-2.5" ] pull_request: - branches: [ "main" ] + branches: [ "main", "release-2.5" ] jobs: off-chain: diff --git a/.github/workflows/test-network-private.yaml b/.github/workflows/test-network-private.yaml index b8185e4d..36ec02de 100644 --- a/.github/workflows/test-network-private.yaml +++ b/.github/workflows/test-network-private.yaml @@ -7,9 +7,9 @@ run-name: ${{ github.actor }} is running the Test Network Private tests 🔒 on: workflow_dispatch: push: - branches: [ "main" ] + branches: [ "main", "release-2.5" ] pull_request: - branches: [ "main" ] + branches: [ "main", "release-2.5" ] jobs: private: diff --git a/.github/workflows/test-network-sbe.yaml b/.github/workflows/test-network-sbe.yaml index 37682f5c..51a12694 100644 --- a/.github/workflows/test-network-sbe.yaml +++ b/.github/workflows/test-network-sbe.yaml @@ -7,9 +7,9 @@ run-name: ${{ github.actor }} is running the Test Network SBE tests 🎵 on: workflow_dispatch: push: - branches: [ "main" ] + branches: [ "main", "release-2.5" ] pull_request: - branches: [ "main" ] + branches: [ "main", "release-2.5" ] jobs: SBE: diff --git a/.github/workflows/test-network-secured.yaml b/.github/workflows/test-network-secured.yaml index a0df52ce..df075158 100644 --- a/.github/workflows/test-network-secured.yaml +++ b/.github/workflows/test-network-secured.yaml @@ -7,9 +7,9 @@ run-name: ${{ github.actor }} is running the Test Network Secured tests 🔔 on: workflow_dispatch: push: - branches: [ "main" ] + branches: [ "main", "release-2.5" ] pull_request: - branches: [ "main" ] + branches: [ "main", "release-2.5" ] jobs: secured: diff --git a/asset-transfer-sbe/chaincode-typescript/package.json b/asset-transfer-sbe/chaincode-typescript/package.json index 43be5e77..7250279f 100644 --- a/asset-transfer-sbe/chaincode-typescript/package.json +++ b/asset-transfer-sbe/chaincode-typescript/package.json @@ -21,8 +21,8 @@ "author": "Hyperledger", "license": "Apache-2.0", "dependencies": { - "fabric-contract-api": "^2.0.0", - "fabric-shim": "^2.0.0" + "fabric-contract-api": "^2.5.0", + "fabric-shim": "^2.5.0" }, "devDependencies": { "@types/chai": "^4.2.11",