Skip to content

Commit a3093e7

Browse files
authored
Update Go to 1.25 (#7326)
* Update Go to 1.25 Signed-off-by: Jason Parraga <sovietaced@gmail.com> * Update golangci-lint Signed-off-by: Jason Parraga <sovietaced@gmail.com> * update boilerplate Signed-off-by: Jason Parraga <sovietaced@gmail.com> * fix new refs Signed-off-by: Jason Parraga <sovietaced@gmail.com> * use bookworm Signed-off-by: Jason Parraga <sovietaced@gmail.com> * make lint-fix Signed-off-by: Jason Parraga <sovietaced@gmail.com> --------- Signed-off-by: Jason Parraga <sovietaced@gmail.com>
1 parent 3f163dd commit a3093e7

61 files changed

Lines changed: 982 additions & 832 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/flyte-binary-v2.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,10 @@ jobs:
3333
with:
3434
go-version-file: go.mod
3535
- name: golangci-lint
36-
uses: golangci/golangci-lint-action@v3
36+
uses: golangci/golangci-lint-action@v9
3737
with:
3838
working-directory: docker/devbox-bundled/bootstrap
39+
version: v2.6.2
3940
- name: Check formatting
4041
working-directory: docker/devbox-bundled/bootstrap
4142
run: |

.github/workflows/go-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
- name: Set up Go
4141
uses: actions/setup-go@v5
4242
with:
43-
go-version: "1.24"
43+
go-version: "1.25"
4444
cache: true
4545

4646
- name: Cache embedded postgres

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Thank you for your interest in contributing to Flyte 2! This guide will help you
1717

1818
Before contributing, ensure you have:
1919
- [Buf CLI](https://buf.build/docs/installation) installed
20-
- Go 1.24.6 or later
20+
- Go 1.25.7 or later
2121
- Node.js and npm (for TypeScript)
2222
- Python 3.10+ with `uv` package manager
2323
- Rust toolchain (if working with Rust bindings)

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Todo(alex): We should add UI into the image when UI is done
22

3-
FROM --platform=${BUILDPLATFORM} golang:1.24-bookworm AS flytebuilder
3+
FROM --platform=${BUILDPLATFORM} golang:1.25-bookworm AS flytebuilder
44

55
ARG TARGETARCH
66
ENV GOARCH="${TARGETARCH}"

boilerplate/flyte/golang_support_tools/go.mod

Lines changed: 198 additions & 139 deletions
Large diffs are not rendered by default.

boilerplate/flyte/golang_support_tools/go.sum

Lines changed: 495 additions & 422 deletions
Large diffs are not rendered by default.

boilerplate/flyte/golang_support_tools/tools.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
package tools
55

66
import (
7-
_ "github.com/vektra/mockery/v3/cmd"
87
_ "github.com/alvaroloes/enumer"
9-
_ "github.com/golangci/golangci-lint/cmd/golangci-lint"
8+
_ "github.com/golangci/golangci-lint/v2/cmd/golangci-lint"
109
_ "github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc"
10+
_ "github.com/vektra/mockery/tools/cmd"
1111

1212
_ "github.com/flyteorg/flyte/flytestdlib/cli/pflags"
1313
)

boilerplate/flyte/golang_test_targets/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ generate: download_tooling #generate go code
1515

1616
.PHONY: lint
1717
lint: download_tooling #lints the package for common code smells
18-
GL_DEBUG=linters_output,env golangci-lint run $(LINT_FLAGS) --timeout=5m --exclude deprecated -v
18+
GL_DEBUG=linters_output,env golangci-lint run $(LINT_FLAGS) --timeout=5m -v
1919

2020
.PHONY: lint-fix
2121
lint-fix: LINT_FLAGS=--fix

boilerplate/flyte/golang_test_targets/download_tooling.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ set -e
1616
# List of tools to go get
1717
# In the format of "<cli>:<package>" or ":<package>" if no cli
1818
tools=(
19-
"github.com/vektra/mockery/v3@v3.7.0"
20-
"github.com/golangci/golangci-lint/cmd/golangci-lint"
19+
"github.com/vektra/mockery/tools@v0.0.0-20260415212850-680532c11aba"
20+
"github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.6.2"
2121
"github.com/daixiang0/gci"
2222
"github.com/alvaroloes/enumer"
2323
"github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc"

boilerplate/flyte/golangci_file/.golangci.yml

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,38 +3,39 @@
33
#
44
# TO OPT OUT OF UPDATES, SEE https://github.com/flyteorg/boilerplate/blob/master/Readme.rst
55

6+
version: "2"
67
run:
7-
skip-dirs:
8-
- pkg/client
9-
8+
allow-parallel-runners: true
109
linters:
11-
disable-all: true
10+
default: none
1211
enable:
13-
- deadcode
12+
- copyloopvar
13+
- dupl
1414
- errcheck
15-
- gas
16-
- gci
15+
- ginkgolinter
1716
- goconst
18-
- goimports
19-
- golint
20-
- gosimple
17+
- gocyclo
2118
- govet
2219
- ineffassign
20+
- lll
2321
- misspell
2422
- nakedret
23+
- prealloc
24+
- revive
2525
- staticcheck
26-
- structcheck
27-
- typecheck
2826
- unconvert
2927
- unparam
3028
- unused
31-
- varcheck
32-
33-
linters-settings:
34-
gci:
35-
custom-order: true
36-
sections:
37-
- standard
38-
- default
39-
- prefix(github.com/flyteorg)
40-
skip-generated: true
29+
settings:
30+
revive:
31+
rules:
32+
- name: comment-spacings
33+
- name: import-shadowing
34+
exclusions:
35+
generated: lax
36+
formatters:
37+
enable:
38+
- gofmt
39+
- goimports
40+
exclusions:
41+
generated: lax

0 commit comments

Comments
 (0)