Skip to content

Commit efd2f78

Browse files
bestbeforetodaybestbeforetoday
authored
Update to Go 1.24 (#226)
Go 1.24 is now the oldest currently supported Go release. - Use specific Uber Mock version to avoid future breakages. - Update actions/setup-go from v5 to v6. - Update Fabric versions for testing to latest releases. - Update Go dependencies. - Remove deprecated dial options. Signed-off-by: Mark S. Lewis <[email protected]>
1 parent 7bb2230 commit efd2f78

File tree

9 files changed

+126
-117
lines changed

9 files changed

+126
-117
lines changed

‎.github/workflows/golang.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- uses: actions/checkout@v5
11-
- uses: actions/setup-go@v5
11+
- uses: actions/setup-go@v6
1212
with:
13-
go-version: "1.21"
13+
go-version-file: go.mod
1414
- name: Generate test mocks
1515
run: make generate
1616
- name: Unit test
@@ -20,9 +20,9 @@ jobs:
2020
runs-on: ubuntu-latest
2121
steps:
2222
- uses: actions/checkout@v5
23-
- uses: actions/setup-go@v5
23+
- uses: actions/setup-go@v6
2424
with:
25-
go-version: stable
25+
go-version-file: go.mod
2626
- name: Generate test mocks
2727
run: make generate
2828
- name: golangci-lint
@@ -36,29 +36,29 @@ jobs:
3636
fail-fast: false
3737
matrix:
3838
include:
39-
- FABRIC_VERSION: "2.5.11"
39+
- FABRIC_VERSION: "2.5.13"
4040
CREATE_CHANNEL: "create_channel"
4141
CONSENSUS: RAFT
42-
- FABRIC_VERSION: "2.5.11"
42+
- FABRIC_VERSION: "2.5.13"
4343
CREATE_CHANNEL: "existing_channel"
4444
CONSENSUS: RAFT
45-
- FABRIC_VERSION: "3.0.0"
45+
- FABRIC_VERSION: "3.1.1"
4646
CREATE_CHANNEL: "create_channel"
4747
CONSENSUS: RAFT
48-
- FABRIC_VERSION: "3.0.0"
48+
- FABRIC_VERSION: "3.1.1"
4949
CREATE_CHANNEL: "existing_channel"
5050
CONSENSUS: RAFT
51-
- FABRIC_VERSION: "3.0.0"
51+
- FABRIC_VERSION: "3.1.1"
5252
CREATE_CHANNEL: "create_channel"
5353
CONSENSUS: BFT
54-
- FABRIC_VERSION: "3.0.0"
54+
- FABRIC_VERSION: "3.1.1"
5555
CREATE_CHANNEL: "existing_channel"
5656
CONSENSUS: BFT
5757
steps:
5858
- uses: actions/checkout@v5
59-
- uses: actions/setup-go@v5
59+
- uses: actions/setup-go@v6
6060
with:
61-
go-version: "1.21"
61+
go-version-file: go.mod
6262
- name: run end to end test
6363
env:
6464
FABRIC_VERSION: ${{matrix.FABRIC_VERSION}}

‎.github/workflows/scan.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
with:
2121
ref: ${{ inputs.ref }}
2222
- name: Set up Go
23-
uses: actions/setup-go@v5
23+
uses: actions/setup-go@v6
2424
with:
2525
go-version: stable
2626
check-latest: true

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,5 +58,5 @@ escapes_detect:
5858

5959
.PHONY: generate
6060
generate:
61-
go install go.uber.org/mock/mockgen@latest
61+
go install go.uber.org/mock/mockgen@v0.6.0
6262
go generate ./pkg/...

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ More detailed information on the motivation and objectives of the fabric-admin-s
1616

1717
This repository contains APIs written in Go and JavaScript. In order to build these components, the following need to be installed and available in the PATH:
1818

19-
- [Go 1.21+](https://go.dev/)
19+
- [Go 1.24+](https://go.dev/)
2020
- [Node 18+](https://nodejs.org/)
2121
- [Make](https://www.gnu.org/software/make/)
2222

‎go.mod‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,52 @@
11
module github.com/hyperledger/fabric-admin-sdk
22

3-
go 1.21
3+
go 1.24.0
44

55
require (
6-
github.com/IBM/sarama v1.43.1
6+
github.com/IBM/sarama v1.46.0
77
github.com/Knetic/govaluate v3.0.0+incompatible
88
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
9-
github.com/hashicorp/go-version v1.6.0
10-
github.com/hyperledger/fabric-gateway v1.5.0
11-
github.com/hyperledger/fabric-protos-go-apiv2 v0.3.3
9+
github.com/hashicorp/go-version v1.7.0
10+
github.com/hyperledger/fabric-gateway v1.8.0
11+
github.com/hyperledger/fabric-protos-go-apiv2 v0.3.7
1212
github.com/mitchellh/mapstructure v1.5.0
13-
github.com/onsi/ginkgo/v2 v2.17.1
14-
github.com/onsi/gomega v1.32.0
13+
github.com/onsi/ginkgo/v2 v2.25.3
14+
github.com/onsi/gomega v1.38.2
1515
github.com/opentracing/opentracing-go v1.2.0
16-
go.uber.org/mock v0.4.0
17-
google.golang.org/grpc v1.63.0
18-
google.golang.org/protobuf v1.33.0
19-
gopkg.in/yaml.v2 v2.4.0
16+
go.uber.org/mock v0.6.0
17+
google.golang.org/grpc v1.75.0
18+
google.golang.org/protobuf v1.36.8
19+
gopkg.in/yaml.v3 v3.0.1
2020
)
2121

2222
require (
23+
github.com/Masterminds/semver/v3 v3.4.0 // indirect
2324
github.com/davecgh/go-spew v1.1.1 // indirect
24-
github.com/eapache/go-resiliency v1.6.0 // indirect
25+
github.com/eapache/go-resiliency v1.7.0 // indirect
2526
github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect
2627
github.com/eapache/queue v1.1.0 // indirect
27-
github.com/go-logr/logr v1.4.1 // indirect
28-
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
28+
github.com/go-logr/logr v1.4.3 // indirect
29+
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
2930
github.com/golang/snappy v0.0.4 // indirect
30-
github.com/google/go-cmp v0.6.0 // indirect
31-
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
32-
github.com/hashicorp/errwrap v1.1.0 // indirect
33-
github.com/hashicorp/go-multierror v1.1.1 // indirect
31+
github.com/google/go-cmp v0.7.0 // indirect
32+
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
3433
github.com/hashicorp/go-uuid v1.0.3 // indirect
3534
github.com/jcmturner/aescts/v2 v2.0.0 // indirect
3635
github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
3736
github.com/jcmturner/gofork v1.7.6 // indirect
3837
github.com/jcmturner/gokrb5/v8 v8.4.4 // indirect
3938
github.com/jcmturner/rpc/v2 v2.0.3 // indirect
40-
github.com/klauspost/compress v1.17.7 // indirect
39+
github.com/klauspost/compress v1.18.0 // indirect
4140
github.com/miekg/pkcs11 v1.1.1 // indirect
42-
github.com/pierrec/lz4/v4 v4.1.21 // indirect
43-
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
41+
github.com/pierrec/lz4/v4 v4.1.22 // indirect
42+
github.com/rcrowley/go-metrics v0.0.0-20250401214520-65e299d6c5c9 // indirect
4443
github.com/rogpeppe/go-internal v1.12.0 // indirect
45-
golang.org/x/crypto v0.31.0 // indirect
46-
golang.org/x/net v0.33.0 // indirect
47-
golang.org/x/sys v0.28.0 // indirect
48-
golang.org/x/text v0.21.0 // indirect
49-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
50-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect
51-
gopkg.in/yaml.v3 v3.0.1 // indirect
44+
go.uber.org/automaxprocs v1.6.0 // indirect
45+
go.yaml.in/yaml/v3 v3.0.4 // indirect
46+
golang.org/x/crypto v0.41.0 // indirect
47+
golang.org/x/net v0.43.0 // indirect
48+
golang.org/x/sys v0.35.0 // indirect
49+
golang.org/x/text v0.28.0 // indirect
50+
golang.org/x/tools v0.36.0 // indirect
51+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
5252
)

0 commit comments

Comments
 (0)