Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update the versions of fabric sdks #1519

Merged
merged 1 commit into from
Apr 3, 2024
Merged

Update the versions of fabric sdks #1519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 11 additions & 16 deletions packages/caliper-cli/lib/lib/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,23 +39,18 @@ sut:
# the 2.4 key without creating a new version and the integration tests will automatically pick it up.
fabric:
# The name/key of the SDK binding
1.4.11:
packages: ['[email protected]', '[email protected]','[email protected]']
1.4.14:
packages: ['[email protected]', '[email protected]','[email protected]']
1.4.20: &fabric-v1-lts
1.4: &fabric-sdk-v1
packages: ['[email protected]', '[email protected]','[email protected]']
1.4: *fabric-v1-lts
2.2.3:
packages: ['[email protected]']
2.2.14: &fabric-v2-lts
packages: ['[email protected]']
2.2: *fabric-v2-lts
2.4:
packages: ['@hyperledger/[email protected]', '@grpc/[email protected]']
latest: *fabric-v1-lts
latest-v2-lts: *fabric-v2-lts
latest-v2: *fabric-v2-lts
1.4.20: *fabric-sdk-v1
1: *fabric-sdk-v1
2.2: &fabric-sdk-v2
packages: ['[email protected]']
2.2.20: *fabric-sdk-v2
2.4: &fabric-gateway
packages: ['@hyperledger/[email protected]', '@grpc/[email protected]']
2.5: *fabric-gateway
3: *fabric-gateway
fabric-gateway: *fabric-gateway

ethereum:
1.2.1:
Expand Down
4 changes: 2 additions & 2 deletions packages/caliper-tests-integration/fabric_tests/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ fi
# BIND with 2.2 SDK, using the package dir as CWD
# Note: do not use env variables for unbinding settings, as subsequent launch calls will pick them up and bind again
# Note: Fabric 2.2 binding is cached in CI
export FABRIC_VERSION=2.2.14
export FABRIC_VERSION=2.2.20
export NODE_PATH="$SUT_DIR/cached/v$FABRIC_VERSION/node_modules"
if [[ "${BIND_IN_PACKAGE_DIR}" = "true" ]]; then
mkdir -p $SUT_DIR/cached/v$FABRIC_VERSION
Expand All @@ -110,7 +110,7 @@ if [[ ${rc} != 0 ]]; then
exit ${rc};
fi

# BIND with 2.4 SDK, using the package dir as CWD
# BIND with 2.4 SDK (which is the same as 2.5, 3, fabric-gateway), using the package dir as CWD
# Note: do not use env variables for unbinding settings, as subsequent launch calls will pick them up and bind again
# Note: Fabric 2.4 binding is NOT cached in CI. This binding is lightweight so doesn't take much time and allows the 2.4 binding to be modified in the config.yaml binding file
export FABRIC_VERSION=2.4
Expand Down
2 changes: 1 addition & 1 deletion packages/caliper-tests-integration/generator_tests/fabric/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ ${GENERATOR_METHOD} -- --workspace 'myWorkspace' --contractId 'mymarbles' --cont
cd ../
# bind the sdk into the packages directory as it will search for it there, this ensures it doesn't contaminate real node_modules dirs (2.2 will work with a 1.4 fabric)
# Note: Fabric 2.2 binding is cached in CI
export FABRIC_VERSION=2.2.14
export FABRIC_VERSION=2.2.20
export NODE_PATH="$SUT_DIR/cached/v$FABRIC_VERSION/node_modules"
if [[ "${BIND_IN_PACKAGE_DIR}" = "true" ]]; then
mkdir -p $SUT_DIR/cached/v$FABRIC_VERSION
Expand Down
Loading