diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index e2c4f1a8..8c796c8a 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: '1.21' + go-version: '1.22' - name: golangci-lint uses: golangci/golangci-lint-action@v6 with: diff --git a/.github/workflows/pr-dependabot.yaml b/.github/workflows/pr-dependabot.yaml index dcd2bb49..dc30c395 100644 --- a/.github/workflows/pr-dependabot.yaml +++ b/.github/workflows/pr-dependabot.yaml @@ -27,7 +27,7 @@ jobs: uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # tag=v5.0.0 with: # go-version: ${{ steps.vars.outputs.go_version }} // TODO: we have to use go version consistent with test infra jobs - go-version: '1.21' + go-version: '1.22' - uses: actions/cache@2cdf405574d6ef1f33a1d12acccd3ae82f47b3f2 # tag=v4.1.0 name: Restore go cache with: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 4d90eb36..04fab8bd 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -22,7 +22,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: '1.21' + go-version: '1.22' - name: Run GoReleaser uses: goreleaser/goreleaser-action@v6 with: diff --git a/.golangci.yaml b/.golangci.yaml index 456df4f9..a992e045 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -1,6 +1,6 @@ run: timeout: 5m - go: "1.21" + go: "1.22" skip-files: - "zz_generated.*\\.go$" allow-parallel-runners: true diff --git a/Makefile b/Makefile index f61685b3..f67a228f 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ ROOT:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST)))) .DEFAULT_GOAL:=help -GO_VERSION ?= 1.21.8 +GO_VERSION ?= 1.22.5 GO_CONTAINER_IMAGE ?= docker.io/library/golang:$(GO_VERSION) # Use GOPROXY environment variable if set diff --git a/Tiltfile b/Tiltfile index 8a340d72..cf9d56b0 100644 --- a/Tiltfile +++ b/Tiltfile @@ -20,7 +20,7 @@ def build_image(): "SECURITY_CONTACTS" ], build_args = { - "builder_image": "docker.io/library/golang:1.20.4", + "builder_image": "docker.io/library/golang:1.22.5", } ) diff --git a/hack/ensure-go.sh b/hack/ensure-go.sh index e13e9afe..1009c39f 100755 --- a/hack/ensure-go.sh +++ b/hack/ensure-go.sh @@ -31,7 +31,7 @@ EOF local go_version IFS=" " read -ra go_version <<< "$(go version)" local minimum_go_version - minimum_go_version=go1.21.8 + minimum_go_version=go1.22.0 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 cat <