Skip to content

Commit 111ea90

Browse files
authored
Merge pull request #5078 from nrb/go1.22
🌱 Update Go version to 1.22.6
2 parents 2b7d990 + 0108e27 commit 111ea90

File tree

10 files changed

+12
-12
lines changed

10 files changed

+12
-12
lines changed

.github/workflows/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Set up Go 1.x
2222
uses: actions/setup-go@v5
2323
with:
24-
go-version: '1.21'
24+
go-version: '1.22'
2525
id: go
2626
- name: Check out code into the Go module directory
2727
uses: actions/[email protected]

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Set up Go
2121
uses: actions/setup-go@v5
2222
with:
23-
go-version: '1.21'
23+
go-version: '1.22'
2424
- name: Set version info
2525
run: |
2626
echo "VERSION=${GITHUB_REF_NAME}" >> $GITHUB_ENV

.golangci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,9 +211,9 @@ linters-settings:
211211
allow-leading-space: false
212212
require-specific: true
213213
staticcheck:
214-
go: "1.21"
214+
go: "1.22"
215215
stylecheck:
216-
go: "1.21"
216+
go: "1.22"
217217
depguard:
218218
rules:
219219
main:

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ include $(ROOT_DIR_RELATIVE)/common.mk
2020
# https://suva.sh/posts/well-documented-makefiles
2121

2222
# Go
23-
GO_VERSION ?=1.21.5
23+
GO_VERSION ?=1.22.6
2424
GO_CONTAINER_IMAGE ?= golang:$(GO_VERSION)
2525

2626
# Directories.

docs/book/src/development/development.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
### Install prerequisites
66

77
1. Install [go][go]
8-
- Get the latest patch version for go v1.21.
8+
- Get the latest patch version for go v1.22.
99
2. Install [jq][jq]
1010
- `brew install jq` on macOS.
1111
- `chocolatey install jq` on Windows.

docs/triage-party/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# limitations under the License.
1616

1717

18-
FROM golang:1.21.5 as builder
18+
FROM golang:1.22.6 as builder
1919

2020
RUN go get github.com/google/triage-party/cmd/server
2121
RUN go install github.com/google/triage-party/cmd/server@latest

docs/triage-party/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module triage-party-deployment
22

3-
go 1.21
3+
go 1.22
44

55
require (
66
github.com/aws/aws-cdk-go/awscdk v1.110.0-devpreview

hack/ensure-go.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ EOF
3131
local go_version
3232
IFS=" " read -ra go_version <<< "$(go version)"
3333
local minimum_go_version
34-
minimum_go_version=go1.21.5
34+
minimum_go_version=go1.22.5
3535
if [[ "${minimum_go_version}" != $(echo -e "${minimum_go_version}\n${go_version[2]}" | sort -s -t. -k 1,1 -k 2,2n -k 3,3n | head -n1) && "${go_version[2]}" != "devel" ]]; then
3636
cat <<EOF
3737
Detected go version: ${go_version[*]}.

hack/tools/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module sigs.k8s.io/cluster-api-provider-aws/hack/tools
22

3-
go 1.21
3+
go 1.22
44

5-
toolchain go1.21.5
5+
toolchain go1.22.6
66

77
// kube-openapi should match the version imported by kustomize.
88
replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f

netlify.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
publish = "docs/book/book"
55

66
[build.environment]
7-
GO_VERSION = "1.21.5"
7+
GO_VERSION = "1.22.6"
88

99
# Standard Netlify redirects
1010
[[redirects]]

0 commit comments

Comments
 (0)