Skip to content

Commit 5af65e2

Browse files
committed
Upgrade to Go 1.22
Signed-off-by: Matthew Whitehead <[email protected]>
1 parent 092a400 commit 5af65e2

File tree

12 files changed

+26
-21
lines changed

12 files changed

+26
-21
lines changed

.github/workflows/go.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Set up Go
2121
uses: actions/setup-go@v4
2222
with:
23-
go-version: 1.21
23+
go-version: 1.22
2424

2525
- name: Build and Test
2626
run: make
@@ -40,7 +40,7 @@ jobs:
4040
- name: Set up Go
4141
uses: actions/setup-go@v4
4242
with:
43-
go-version: 1.21
43+
go-version: 1.22
4444

4545
- name: Build Docker image
4646
run: make docker
@@ -132,7 +132,7 @@ jobs:
132132
- name: Set up Go
133133
uses: actions/setup-go@v4
134134
with:
135-
go-version: 1.21
135+
go-version: 1.22
136136

137137
- name: Download Docker image
138138
uses: actions/download-artifact@v3

.github/workflows/integration.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
- name: Set up Go
5555
uses: actions/setup-go@v4
5656
with:
57-
go-version: 1.21
57+
go-version: 1.22
5858

5959
- name: Update manifest to latest commit for every service
6060
run: ./manifestgen.sh head
@@ -91,7 +91,7 @@ jobs:
9191
- name: Set up Go
9292
uses: actions/setup-go@v4
9393
with:
94-
go-version: 1.21
94+
go-version: 1.22
9595

9696
- name: Update manifest to latest commit for every service
9797
run: ./manifestgen.sh head

doc-site/docs/contributors/dev_environment_setup.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ This guide will walk you through setting up your machine for contributing to Fir
1212

1313
You will need a few prerequisites set up on your machine before you can build FireFly from source. We recommend doing development on macOS, Linux, or WSL 2.0.
1414

15-
- [Go 1.21](https://golang.org/dl/)
15+
- [Go 1.22](https://golang.org/dl/)
1616
- make
1717
- GCC
1818
- openssl

doc-site/docs/releasenotes/1.3_migration_guide.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,4 +103,4 @@ Prior to FireFly v1.3.0, when the FabConnect client indexed events submitted by
103103

104104
### Go version upgrade
105105

106-
FireFly v1.3.0 now uses Go 1.21 across all modules.
106+
FireFly v1.3.2 now uses Go 1.22 across all modules.

go.mod

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/hyperledger/firefly
22

3-
go 1.21
3+
go 1.22
4+
5+
toolchain go1.22.7
46

57
require (
68
blockwatch.cc/tzgo v1.17.1
@@ -15,8 +17,8 @@ require (
1517
github.com/golang-migrate/migrate/v4 v4.17.0
1618
github.com/gorilla/mux v1.8.1
1719
github.com/gorilla/websocket v1.5.1
18-
github.com/hyperledger/firefly-common v1.4.9
19-
github.com/hyperledger/firefly-signer v1.1.14
20+
github.com/hyperledger/firefly-common v1.4.10
21+
github.com/hyperledger/firefly-signer v1.1.15
2022
github.com/jarcoal/httpmock v1.2.0
2123
github.com/lib/pq v1.10.9
2224
github.com/mattn/go-sqlite3 v1.14.19

go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+l
7777
github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
7878
github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
7979
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
80-
github.com/hyperledger/firefly-common v1.4.9 h1:PfPZ73FN8WUoPl8iF8ud00B8476+jmqXHHi94w0Krbc=
81-
github.com/hyperledger/firefly-common v1.4.9/go.mod h1:dXewcVMFNON2SvQ1UPvu64OWUt77+M3p8qy61lT1kE4=
82-
github.com/hyperledger/firefly-signer v1.1.14 h1:gSGwdBHTLPchGlmLOKk2Y2nawfMhlH2CDm2owt0lIUE=
83-
github.com/hyperledger/firefly-signer v1.1.14/go.mod h1:Xj2PF6y8Ce26jX38ch0KasNnnZCSyzcwyLSv8NN+7JA=
80+
github.com/hyperledger/firefly-common v1.4.10 h1:NgUYorxZF3tNkL7bBqe3PlwA42pPAYlj0wStnUsjN9Y=
81+
github.com/hyperledger/firefly-common v1.4.10/go.mod h1:E7w/RxNtVnX52WXLQW9f2xVAgZnW70voZeE9sZrx/q0=
82+
github.com/hyperledger/firefly-signer v1.1.15 h1:oJXrX1ziDIxzSbRX+risVEmprx3McD1yi0S1S5La4zc=
83+
github.com/hyperledger/firefly-signer v1.1.15/go.mod h1:E/TO0Koi4BqSr8hRhKJVTxiynwX/EQYjqqKrlnsQK7o=
8484
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
8585
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
8686
github.com/invopop/yaml v0.2.0 h1:7zky/qH+O0DwAyoobXUqvVBwgBFRxKoQ/3FjcVpjTMY=

go.work

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
go 1.21
1+
go 1.22
2+
3+
toolchain go1.22.7
24

35
use (
46
.

go.work.sum

+1
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,7 @@ github.com/hashicorp/go-memdb v1.3.3/go.mod h1:uBTr1oQbtuMgd1SSGoR8YV27eT3sBHbYi
253253
github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
254254
github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
255255
github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4=
256+
github.com/hyperledger/firefly-common v1.4.10 h1:NgUYorxZF3tNkL7bBqe3PlwA42pPAYlj0wStnUsjN9Y=
256257
github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
257258
github.com/jackc/pgconn v1.14.0/go.mod h1:9mBNlny0UvkgJdCDvdVHYSjI+8tD2rnKK69Wz8ti++E=
258259
github.com/jackc/pgerrcode v0.0.0-20220416144525-469b46aa5efa/go.mod h1:a/s9Lp5W7n/DD0VrVoyJ00FbP2ytTPDVOivvn2bMlds=

manifest.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@
4141
},
4242
"build": {
4343
"firefly-builder": {
44-
"image": "golang:1.21-alpine3.19"
44+
"image": "golang:1.22-alpine3.19"
4545
},
4646
"fabric-builder": {
47-
"image": "golang:1.21",
47+
"image": "golang:1.22",
4848
"platform": "linux/x86_64"
4949
},
5050
"solidity-builder": {

smart_contracts/fabric/custompin-sample/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/hyperledger/firefly/custompin_sample
22

3-
go 1.21
3+
go 1.22
44

55
require (
66
github.com/hyperledger/fabric-chaincode-go v0.0.0-20240124143825-7dec3c7e7d45

smart_contracts/fabric/firefly-go/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/hyperledger/firefly/chaincode-go
22

3-
go 1.21
3+
go 1.22
44

55
require (
66
github.com/golang/protobuf v1.5.3

test/data/contracts/assetcreator/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/hyperledger/firefly/test/data/assetcreator
22

3-
go 1.21
3+
go 1.22
44

5-
toolchain go1.21.0
5+
toolchain go1.22.0
66

77
require github.com/hyperledger/fabric-contract-api-go v1.2.2
88

0 commit comments

Comments
 (0)