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.

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

Bump dependencies #1207

Merged
merged 1 commit into from
May 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .github/actions/test-network-setup/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: Set up the Test Network Runtime
inputs:
go-version:
description: Version of go
default: '1.21'
default: '1.22'
satota2 marked this conversation as resolved.
Show resolved Hide resolved
node-version:
description: Version of node
default: 18.x
Expand All @@ -12,10 +12,10 @@ inputs:
default: 11.x
fabric-version:
description: Version of Hyperledger Fabric
default: 2.5.7
default: 2.5.8
ca-version:
description: Version of Hyperledger Fabric CA
default: 1.5.10
default: 1.5.11

runs:
using: "composite"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ concurrency:
cancel-in-progress: true

env:
GO_VER: '1.21'
GO_VER: '1.22'
satota2 marked this conversation as resolved.
Show resolved Hide resolved
NODE_VER: 18.x
JAVA_VER: 11.x

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ function context() {
export ${name}="${!override_name:-${default_value}}"
}

context FABRIC_VERSION 2.5.1
context FABRIC_CA_VERSION 1.5.6
context FABRIC_VERSION 2.5.8
context FABRIC_CA_VERSION 1.5.11

context CLUSTER_RUNTIME kind # or k3s for Rancher
context CONTAINER_CLI docker # or nerdctl for containerd
Expand Down Expand Up @@ -88,7 +88,7 @@ context INIT_IMAGE_LABEL latest
context GRPCWEB_IMAGE ghcr.io/hyperledger-labs/grpc-web
context GRPCWEB_IMAGE_LABEL latest
context COUCHDB_IMAGE couchdb
context COUCHDB_IMAGE_LABEL 3.3.2
context COUCHDB_IMAGE_LABEL 3.3.3
context CONSOLE_IMAGE ghcr.io/hyperledger-labs/fabric-console
context CONSOLE_IMAGE_LABEL latest
context DEPLOYER_IMAGE ghcr.io/ibm-blockchain/fabric-deployer
Expand Down
2 changes: 1 addition & 1 deletion test-network/addOrg3/compose/compose-couch-org3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ networks:
services:
couchdb4:
container_name: couchdb4
image: couchdb:3.3.2
image: couchdb:3.3.3
labels:
service: hyperledger-fabric
# Populate the COUCHDB_USER and COUCHDB_PASSWORD to set an admin user and password
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ networks:
services:
couchdb4:
container_name: couchdb4
image: couchdb:3.3.2
image: couchdb:3.3.3
labels:
service: hyperledger-fabric
# Populate the COUCHDB_USER and COUCHDB_PASSWORD to set an admin user and password
Expand Down
4 changes: 2 additions & 2 deletions test-network/compose/compose-couch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ networks:
services:
couchdb0:
container_name: couchdb0
image: couchdb:3.3.2
image: couchdb:3.3.3
labels:
service: hyperledger-fabric
# Populate the COUCHDB_USER and COUCHDB_PASSWORD to set an admin user and password
Expand Down Expand Up @@ -41,7 +41,7 @@ services:

couchdb1:
container_name: couchdb1
image: couchdb:3.3.2
image: couchdb:3.3.3
labels:
service: hyperledger-fabric
# Populate the COUCHDB_USER and COUCHDB_PASSWORD to set an admin user and password
Expand Down
8 changes: 4 additions & 4 deletions test-network/scripts/utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ function printHelp() {
println
println " Flags:"
println " Used with \033[0;32mnetwork.sh prereq\033[0m:"
println " -i FabricVersion (default: '2.5.4')"
println " -cai Fabric CA Version (default: '1.5.7')"
println " -i FabricVersion (default: '2.5.8')"
println " -cai Fabric CA Version (default: '1.5.11')"
println
elif [ "$USAGE" == "up" ]; then
println "Usage: "
Expand Down Expand Up @@ -159,8 +159,8 @@ function printHelp() {
println
println " Flags:"
println " Used with \033[0;32mnetwork.sh prereq\033[0m"
println " -i FabricVersion (default: '2.5.4')"
println " -cai Fabric CA Version (default: '1.5.7')"
println " -i FabricVersion (default: '2.5.8')"
println " -cai Fabric CA Version (default: '1.5.11')"
println
println " Used with \033[0;32mnetwork.sh up\033[0m, \033[0;32mnetwork.sh createChannel\033[0m:"
println " -ca - Use Certificate Authorities to generate network crypto material"
Expand Down
Loading