Skip to content

Update to go 1.23 #1680

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

Merged
EnriqueL8 merged 8 commits into from
Apr 30, 2025
Merged

Update to go 1.23 #1680

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4780d44
Update project go version to 1.24.2
SupernaviX Apr 28, 2025
03625d0
Update project x/crypto version to 0.37.0
SupernaviX Apr 28, 2025
22281c7
Update linter version for compatibility
SupernaviX Apr 28, 2025
261171d
Fix makefile
SupernaviX Apr 28, 2025
be2a632
Switch to go1.23 and new firefly-core
SupernaviX Apr 29, 2025
33783ae
Fix tests
SupernaviX Apr 29, 2025
533f6a4
Update firefly-signer patch version
SupernaviX Apr 29, 2025
da7afa0
Install golangci-lint the old way
SupernaviX Apr 29, 2025
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
6 changes: 3 additions & 3 deletions .github/workflows/go.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v4
with:
go-version: 1.22
go-version: 1.23

- name: Build and Test
run: make
Expand All @@ -54,7 +54,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v4
with:
go-version: 1.22
go-version: 1.23

- name: Build Docker image
run: make docker
Expand Down Expand Up @@ -146,7 +146,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v4
with:
go-version: 1.22
go-version: 1.23

- name: Download Docker image
uses: actions/download-artifact@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v4
with:
go-version: 1.22
go-version: 1.23

- name: Update manifest to latest commit for every service
run: ./manifestgen.sh head
Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v4
with:
go-version: 1.22
go-version: 1.23

- name: Update manifest to latest commit for every service
run: ./manifestgen.sh head
Expand Down
4 changes: 2 additions & 2 deletions .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
run:
tests: false
skip-dirs:
issues:
exclude-dirs:
- "mocks"
- "ffconfig"
- "test/e2e"
linters-settings:
golint: {}
gocritic:
enabled-checks: []
disabled-checks:
Expand Down
12 changes: 6 additions & 6 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ FROM $FIREFLY_BUILDER_TAG AS firefly-builder
ARG BUILD_VERSION
ARG GIT_REF
RUN apk add make=4.4.1-r2 \
gcc=13.2.1_git20231014-r0 \
gcc=14.2.0-r4 \
build-base=0.5-r3 \
curl=8.12.1-r0 \
git=2.43.6-r0
curl=8.12.1-r1 \
git=2.47.2-r0
WORKDIR /firefly
RUN chgrp -R 0 /firefly \
&& chmod -R g+rwX /firefly \
Expand Down Expand Up @@ -61,7 +61,7 @@ RUN mkdir -p build/contracts \
&& mv combined.json Firefly.json

# SBOM
FROM alpine:3.19 AS sbom
FROM alpine:3.21 AS sbom
WORKDIR /
ADD . /SBOM
RUN apk add --no-cache curl
Expand All @@ -74,9 +74,9 @@ FROM $BASE_TAG
ARG UI_TAG
ARG UI_RELEASE
RUN apk add --update --no-cache \
sqlite=3.44.2-r0 \
sqlite=3.48.0-r1 \
postgresql16-client=16.8-r0 \
curl=8.12.1-r0 \
curl=8.12.1-r1 \
jq=1.7.1-r0
WORKDIR /firefly
RUN chgrp -R 0 /firefly \
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ lint: ${LINT}
${MOCKERY}:
$(VGO) install github.com/vektra/mockery/v2@latest
${LINT}:
$(VGO) install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.54.0
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/HEAD/install.sh | sh -s -- -b $(shell $(VGO) env GOPATH)/bin v1.64.8
Copy link
Contributor

@EnriqueL8 EnriqueL8 Apr 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this change?

Copy link
Contributor Author

@SupernaviX SupernaviX Apr 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@EnriqueL8 I updated the linter version to one which "officially" supported go 1.23 and 1.24. I made this change when the PR targeted go 1.24, because

  • golint can't lint go 1.24 files if it was compiled with go 1.23
  • by default, golint is compiled with go 1.23 (even if you're using a 1.24 compiler)
  • the golint docs recommended using prebuilt binaries instead of installing from source.

But I just tested and the old install approach works fine with go 1.23, so I'll switch back to that.

Copy link
Contributor Author

@SupernaviX SupernaviX Apr 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yep switching back worked without a hitch

Copy link
Contributor

@EnriqueL8 EnriqueL8 Apr 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the clarification!

ffcommon:
$(eval WSCLIENT_PATH := $(shell $(VGO) list -f '{{.Dir}}' github.com/hyperledger/firefly-common/pkg/wsclient))

Expand Down
Loading