Skip to content

Commit

Permalink
Bump toolchain to Go 1.22 and 1.23 (with 1.21 going EOL)
Browse files Browse the repository at this point in the history
This doesn't implement the switch to `toolchain` directive yet.
  • Loading branch information
jingyuanliang committed Sep 3, 2024
1 parent e267958 commit b00d594
Show file tree
Hide file tree
Showing 8 changed files with 354 additions and 651 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/crossbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
crossbuild:
strategy:
matrix:
go-version: [ "1.21", "1.22" ]
go-version: [ "1.22", "1.23" ]
platform: [ "ubuntu-latest" ]
runs-on: ${{ matrix.platform }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
test:
strategy:
matrix:
go-version: [ "1.21", "1.22" ]
go-version: [ "1.22", "1.23" ]
platform: [ "ubuntu-latest" ]
runs-on: ${{ matrix.platform }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tools.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
tools:
strategy:
matrix:
go-version: [ "1.21", "1.22" ]
go-version: [ "1.22", "1.23" ]
platform: [ "ubuntu-latest" ]
runs-on: ${{ matrix.platform }}
steps:
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ ARCH := $(if $(GOARCH),$(GOARCH),$(shell GOTOOLCHAIN=local go env GOARCH))

TAG := $(VERSION)__$(OS)_$(ARCH)

GO_VERSION := 1.22
GO_VERSION := 1.23
BUILD_IMAGE := golang:$(GO_VERSION)-alpine

BIN_EXTENSION :=
Expand Down Expand Up @@ -232,7 +232,7 @@ $(LICENSES): | $(BUILD_DIRS)
--env HTTP_PROXY="$(HTTP_PROXY)" \
--env HTTPS_PROXY="$(HTTPS_PROXY)" \
$(BUILD_IMAGE) \
go install github.com/google/go-licenses
go install github.com/google/go-licenses/v2
# The tool runs in a container because it execs `go`, which doesn't
# play nicely with CI. The tool also wants its output dir to not
# exist, so we can't just volume mount $(LICENSES).
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module github.com/thockin/go-build-template

go 1.21
go 1.22

require github.com/spf13/pflag v1.0.5 // indirect
require github.com/spf13/pflag v1.0.5
217 changes: 106 additions & 111 deletions tools/go.mod

Large diffs are not rendered by default.

772 changes: 240 additions & 532 deletions tools/go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tools/tools.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ package tools
import (
_ "github.com/estesp/manifest-tool/v2/cmd/manifest-tool"
_ "github.com/golangci/golangci-lint/cmd/golangci-lint"
_ "github.com/google/go-licenses"
_ "github.com/google/go-licenses/v2"
)

0 comments on commit b00d594

Please sign in to comment.