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 to Go 1.23 #1300

Merged
merged 1 commit into from
Feb 12, 2025
Merged

Update to Go 1.23 #1300

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
2 changes: 1 addition & 1 deletion .github/actions/test-network-setup/action.yaml
View file
Open in desktop
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.22'
default: '1.23'
node-version:
description: Version of node
default: 18.x
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lint.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@ run-name: ${{ github.actor }} is linting fabric-samples 🎉
on:
workflow_dispatch:
push:
branches: [ "main", "release-2.5" ]
branches: ["main", "release-2.5"]
pull_request:
branches: [ "main", "release-2.5" ]
branches: ["main", "release-2.5"]

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

env:
GO_VER: '1.22'
GO_VER: "1.23"
NODE_VER: 18.x
JAVA_VER: 11.x

Expand Down
2 changes: 1 addition & 1 deletion asset-transfer-abac/chaincode-go/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hyperledger/fabric-samples/asset-transfer-abac/chaincode-go

go 1.22.0
go 1.23.0

require github.com/hyperledger/fabric-contract-api-go/v2 v2.2.0

Expand Down
2 changes: 1 addition & 1 deletion asset-transfer-basic/application-gateway-go/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module assetTransfer

go 1.22.0
go 1.23.0

require (
github.com/hyperledger/fabric-gateway v1.7.0
Expand Down
4 changes: 2 additions & 2 deletions asset-transfer-basic/chaincode-external/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
#
# SPDX-License-Identifier: Apache-2.0

ARG GO_VER=1.22
ARG ALPINE_VER=3.20
ARG GO_VER=1.23
ARG ALPINE_VER=3.21

FROM golang:${GO_VER}-alpine${ALPINE_VER}

Expand Down
2 changes: 1 addition & 1 deletion asset-transfer-basic/chaincode-external/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hyperledger/fabric-samples/asset-transfer-basic/chaincode-external

go 1.22.0
go 1.23.0

require (
github.com/hyperledger/fabric-chaincode-go/v2 v2.0.0
Expand Down
2 changes: 1 addition & 1 deletion asset-transfer-basic/chaincode-go/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hyperledger/fabric-samples/asset-transfer-basic/chaincode-go

go 1.22.0
go 1.23.0

require (
github.com/hyperledger/fabric-chaincode-go/v2 v2.0.0
Expand Down
2 changes: 1 addition & 1 deletion asset-transfer-basic/rest-api-go/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module rest-api-go

go 1.22.0
go 1.23.0

require (
github.com/hyperledger/fabric-gateway v1.7.0
Expand Down
2 changes: 1 addition & 1 deletion asset-transfer-events/application-gateway-go/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module assetTransfer

go 1.22.0
go 1.23.0

require (
github.com/hyperledger/fabric-gateway v1.7.0
Expand Down
2 changes: 1 addition & 1 deletion asset-transfer-events/chaincode-go/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hyperledger/fabric-samples/asset-transfer-events/chaincode-go

go 1.22.0
go 1.23.0

require github.com/hyperledger/fabric-contract-api-go/v2 v2.2.0

Expand Down
2 changes: 1 addition & 1 deletion asset-transfer-ledger-queries/chaincode-go/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hyperledger/fabric-samples/asset-transfer-ledger-queries/chaincode-go

go 1.22.0
go 1.23.0

require (
github.com/hyperledger/fabric-chaincode-go/v2 v2.0.0
Expand Down
8 changes: 2 additions & 6 deletions asset-transfer-private-data/application-gateway-go/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
module assetTransfer

go 1.22.0
go 1.23.0

require (
github.com/hyperledger/fabric-gateway v1.6.0
github.com/hyperledger/fabric-protos-go-apiv2 v0.3.3
google.golang.org/grpc v1.67.0
)

require (
github.com/golang/protobuf v1.5.3 // indirect
github.com/hyperledger/fabric-protos-go v0.0.0-20200707132912-fee30f3ccd23 // indirect
github.com/hyperledger/fabric-protos-go-apiv2 v0.3.3 // indirect
github.com/hyperledger/fabric-sdk-go v1.0.0 // indirect
github.com/miekg/pkcs11 v1.1.1 // indirect
github.com/pkg/errors v0.8.1 // indirect
golang.org/x/crypto v0.27.0 // indirect
golang.org/x/net v0.29.0 // indirect
golang.org/x/sys v0.25.0 // indirect
Expand Down
191 changes: 0 additions & 191 deletions asset-transfer-private-data/application-gateway-go/go.sum
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion asset-transfer-private-data/chaincode-go/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hyperledger/fabric-samples/asset-transfer-private-data/chaincode-go

go 1.22.0
go 1.23.0

require (
github.com/hyperledger/fabric-chaincode-go/v2 v2.0.0
Expand Down
2 changes: 1 addition & 1 deletion asset-transfer-secured-agreement/chaincode-go/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hyperledger/fabric-samples/chaincode/tradingMarbles

go 1.22.0
go 1.23.0

require (
github.com/hyperledger/fabric-chaincode-go/v2 v2.0.0
Expand Down
2 changes: 1 addition & 1 deletion auction-dutch/chaincode-go-auditor/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hyperledger/fabric-samples/auction/dutch-auction/chaincode-go-auditor

go 1.22.0
go 1.23.0

require (
github.com/hyperledger/fabric-chaincode-go/v2 v2.0.0
Expand Down
2 changes: 1 addition & 1 deletion auction-dutch/chaincode-go/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hyperledger/fabric-samples/auction/dutch-auction/chaincode-go

go 1.22.0
go 1.23.0

require (
github.com/hyperledger/fabric-chaincode-go/v2 v2.0.0
Expand Down
2 changes: 1 addition & 1 deletion auction-simple/chaincode-go/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hyperledger/fabric-samples/auction/chaincode-go

go 1.22.0
go 1.23.0

require (
github.com/hyperledger/fabric-chaincode-go/v2 v2.0.0
Expand Down
2 changes: 1 addition & 1 deletion full-stack-asset-transfer-guide/infrastructure/multipass-cloud-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ write_files:
fi

if [ ${HLF_VERSION:0:4} = '2.5.' -o ${HLF_VERSION:0:4} = '2.4.']; then
export GO_VERSION=1.18.10
export GO_VERSION=1.23.6
elif [ ${HLF_VERSION:0:4} = '2.2.' -o ${HLF_VERSION:0:4} = '2.3.' ]; then
export GO_VERSION=1.14.11
elif [ ${HLF_VERSION:0:4} = '2.0.' -o ${HLF_VERSION:0:4} = '2.1.' ]; then
Expand Down
2 changes: 1 addition & 1 deletion hardware-security-module/application-go/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hyperledger/fabric-samples/hardware-security-module/application-go

go 1.22.0
go 1.23.0

require (
github.com/hyperledger/fabric-gateway v1.7.0
Expand Down
2 changes: 1 addition & 1 deletion high-throughput/application-go/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hyperledger/fabric-samples/high-throughput/application-go

go 1.22.0
go 1.23.0

require github.com/hyperledger/fabric-sdk-go v1.0.0

Expand Down
2 changes: 1 addition & 1 deletion high-throughput/chaincode-go/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hyperledger/fabric-samples/high-throughput/chaincode

go 1.22.0
go 1.23.0

require (
github.com/hyperledger/fabric-chaincode-go v0.0.0-20230228194215-b84622ba6a7a
Expand Down
2 changes: 1 addition & 1 deletion token-erc-1155/chaincode-go/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module erc1155

go 1.22.0
go 1.23.0

require github.com/hyperledger/fabric-contract-api-go/v2 v2.2.0

Expand Down
2 changes: 1 addition & 1 deletion token-erc-20/chaincode-go/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hyperledger/fabric-samples/token-erc-20/chaincode-go

go 1.22.0
go 1.23.0

require github.com/hyperledger/fabric-contract-api-go/v2 v2.2.0

Expand Down
2 changes: 1 addition & 1 deletion token-erc-721/chaincode-go/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hyperledger/fabric-samples/token-erc-721/chaincode-go

go 1.22.0
go 1.23.0

require (
github.com/hyperledger/fabric-chaincode-go/v2 v2.0.0
Expand Down
4 changes: 2 additions & 2 deletions token-sdk/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#build stage
FROM golang:1.20.7-bookworm AS builder
FROM golang:1.23-bookworm AS builder
WORKDIR /go/src/app
COPY go.mod .
COPY go.sum .
Expand All @@ -8,7 +8,7 @@ COPY . .
RUN go build -o /go/bin/app

#final stage
FROM golang:1.20.7-bookworm
FROM golang:1.23-bookworm
COPY --from=builder /go/bin/app /app
ENTRYPOINT /app
LABEL Name=tokens Version=0.1.0
Expand Down
2 changes: 1 addition & 1 deletion token-sdk/auditor/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hyperledger/fabric-samples/token-sdk/auditor

go 1.22.0
go 1.23.0

replace github.com/ugorji/go v1.1.4 => github.com/ugorji/go/codec v1.2.9

Expand Down
2 changes: 1 addition & 1 deletion token-sdk/e2e/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hyperledger/fabric-samples/token-sdk/e2e

go 1.22.0
go 1.23.0

require (
github.com/deepmap/oapi-codegen v1.16.3
Expand Down
2 changes: 1 addition & 1 deletion token-sdk/go.work
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
go 1.22.0
go 1.23.0

use (
./auditor
Expand Down
2 changes: 1 addition & 1 deletion token-sdk/issuer/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hyperledger/fabric-samples/token-sdk/issuer

go 1.22.0
go 1.23.0

replace github.com/ugorji/go v1.1.4 => github.com/ugorji/go/codec v1.2.9

Expand Down
2 changes: 1 addition & 1 deletion token-sdk/owner/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hyperledger/fabric-samples/token-sdk/owner

go 1.22.0
go 1.23.0

replace github.com/ugorji/go v1.1.4 => github.com/ugorji/go/codec v1.2.9

Expand Down
4 changes: 2 additions & 2 deletions token-sdk/tokenchaincode/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20 as builder
FROM golang:1.23 as builder
RUN git clone https://github.com/hyperledger-labs/fabric-token-sdk.git
WORKDIR fabric-token-sdk

Expand All @@ -7,7 +7,7 @@ RUN git checkout v0.3.0 && go mod download
RUN CGO_ENABLED=1 go build -buildvcs=false -o /tcc token/services/network/fabric/tcc/main/main.go && chmod +x /tcc

# Final image
FROM golang:1.20
FROM golang:1.23
COPY --from=builder /tcc .
EXPOSE 9999

Expand Down
2 changes: 1 addition & 1 deletion token-utxo/chaincode-go/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/hyperledger/fabric-samples/token-utxo/chaincode-go

go 1.22.0
go 1.23.0

require github.com/hyperledger/fabric-contract-api-go/v2 v2.2.0

Expand Down
Loading