Skip to content

Commit 36b4179

Browse files
authored
Merge pull request #1680 from SundaeSwap-finance/update-go-1-24
Update to go 1.23
2 parents 5adbdfc + da7afa0 commit 36b4179

File tree

17 files changed

+2855
-77
lines changed

17 files changed

+2855
-77
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.23
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.23
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.23
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.23
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.23
9898

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

.golangci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
run:
22
tests: false
3-
skip-dirs:
3+
issues:
4+
exclude-dirs:
45
- "mocks"
56
- "ffconfig"
67
- "test/e2e"
78
linters-settings:
8-
golint: {}
99
gocritic:
1010
enabled-checks: []
1111
disabled-checks:

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 \

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ lint: ${LINT}
2323
${MOCKERY}:
2424
$(VGO) install github.com/vektra/mockery/v2@latest
2525
${LINT}:
26-
$(VGO) install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.54.0
26+
$(VGO) install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.8
2727
ffcommon:
2828
$(eval WSCLIENT_PATH := $(shell $(VGO) list -f '{{.Dir}}' github.com/hyperledger/firefly-common/pkg/wsclient))
2929

0 commit comments

Comments
 (0)