Skip to content

Commit 4780d44

Browse files
committed
Update project go version to 1.24.2
Signed-off-by: Simon Gellis <simongellis@gmail.com>
1 parent 5adbdfc commit 4780d44

File tree

9 files changed

+22
-22
lines changed

9 files changed

+22
-22
lines changed

.github/workflows/go.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Set up Go
3535
uses: actions/setup-go@v4
3636
with:
37-
go-version: 1.22
37+
go-version: 1.24
3838

3939
- name: Build and Test
4040
run: make
@@ -54,7 +54,7 @@ jobs:
5454
- name: Set up Go
5555
uses: actions/setup-go@v4
5656
with:
57-
go-version: 1.22
57+
go-version: 1.24
5858

5959
- name: Build Docker image
6060
run: make docker
@@ -146,7 +146,7 @@ jobs:
146146
- name: Set up Go
147147
uses: actions/setup-go@v4
148148
with:
149-
go-version: 1.22
149+
go-version: 1.24
150150

151151
- name: Download Docker image
152152
uses: actions/download-artifact@v4

.github/workflows/integration.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
- name: Set up Go
5858
uses: actions/setup-go@v4
5959
with:
60-
go-version: 1.22
60+
go-version: 1.24
6161

6262
- name: Update manifest to latest commit for every service
6363
run: ./manifestgen.sh head
@@ -94,7 +94,7 @@ jobs:
9494
- name: Set up Go
9595
uses: actions/setup-go@v4
9696
with:
97-
go-version: 1.22
97+
go-version: 1.24
9898

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

Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ FROM $FIREFLY_BUILDER_TAG AS firefly-builder
1515
ARG BUILD_VERSION
1616
ARG GIT_REF
1717
RUN apk add make=4.4.1-r2 \
18-
gcc=13.2.1_git20231014-r0 \
18+
gcc=14.2.0-r4 \
1919
build-base=0.5-r3 \
20-
curl=8.12.1-r0 \
21-
git=2.43.6-r0
20+
curl=8.12.1-r1 \
21+
git=2.47.2-r0
2222
WORKDIR /firefly
2323
RUN chgrp -R 0 /firefly \
2424
&& chmod -R g+rwX /firefly \
@@ -61,7 +61,7 @@ RUN mkdir -p build/contracts \
6161
&& mv combined.json Firefly.json
6262

6363
# SBOM
64-
FROM alpine:3.19 AS sbom
64+
FROM alpine:3.21 AS sbom
6565
WORKDIR /
6666
ADD . /SBOM
6767
RUN apk add --no-cache curl
@@ -74,9 +74,9 @@ FROM $BASE_TAG
7474
ARG UI_TAG
7575
ARG UI_RELEASE
7676
RUN apk add --update --no-cache \
77-
sqlite=3.44.2-r0 \
77+
sqlite=3.48.0-r1 \
7878
postgresql16-client=16.8-r0 \
79-
curl=8.12.1-r0 \
79+
curl=8.12.1-r1 \
8080
jq=1.7.1-r0
8181
WORKDIR /firefly
8282
RUN chgrp -R 0 /firefly \

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/hyperledger/firefly
22

3-
go 1.22
3+
go 1.24
44

5-
toolchain go1.22.7
5+
toolchain go1.24.2
66

77
require (
88
blockwatch.cc/tzgo v1.17.1

go.work

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
go 1.22
1+
go 1.24
22

3-
toolchain go1.22.7
3+
toolchain go1.24.2
44

55
use (
66
.

manifest.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,17 @@
4141
},
4242
"build": {
4343
"firefly-builder": {
44-
"image": "golang:1.22-alpine3.19"
44+
"image": "golang:1.24-alpine3.21"
4545
},
4646
"fabric-builder": {
47-
"image": "golang:1.22",
47+
"image": "golang:1.24",
4848
"platform": "linux/x86_64"
4949
},
5050
"solidity-builder": {
5151
"image": "ethereum/solc:0.8.11-alpine"
5252
},
5353
"base": {
54-
"image": "alpine:3.19.7"
54+
"image": "alpine:3.21.3"
5555
}
5656
},
5757
"ui": {

smart_contracts/fabric/custompin-sample/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/hyperledger/firefly/custompin_sample
22

3-
go 1.22
3+
go 1.24
44

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

smart_contracts/fabric/firefly-go/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/hyperledger/firefly/chaincode-go
22

3-
go 1.22
3+
go 1.24
44

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

test/data/contracts/assetcreator/go.mod

Lines changed: 2 additions & 2 deletions
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.22
3+
go 1.24
44

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

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

0 commit comments

Comments
 (0)