Skip to content

Commit

Permalink
Bump to Go 1.21
Browse files Browse the repository at this point in the history
Signed-off-by: Stefan Büringer buringerst@vmware.com
  • Loading branch information
sbueringer committed Feb 15, 2024
1 parent 306fc7f commit e5c34ae
Show file tree
Hide file tree
Showing 8 changed files with 74 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cover.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
with:
go-version: '1.20'
go-version: '1.21'
- run: "PATH=/usr/local/go/bin:$PATH make test-cover"
- uses: Wandalen/wretry.action@62451a214c01d1b0136b4f87289d840b30d67b98 # v1.3.0 Retry codecov upload. It is flaky due to a known issue https://community.codecov.com/t/upload-issues-unable-to-locate-build-via-github-actions-api/3954
with:
Expand Down
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
run:
timeout: 10m
go: "1.20"
go: "1.21"
skip-files:
- "zz_generated.*\\.go$"
allow-parallel-runners: true
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ SHELL:=/usr/bin/env bash
#
# Go.
#
GO_VERSION ?= 1.20.12
GO_VERSION ?= 1.21.5
GO_CONTAINER_IMAGE ?= docker.io/library/golang:$(GO_VERSION)

# Use GOPROXY environment variable if set
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module sigs.k8s.io/cluster-api-provider-vsphere

go 1.20
go 1.21

replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.6.1

Expand Down
35 changes: 35 additions & 0 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion hack/ensure-go.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ set -o pipefail
# MIN_GO_VERSION is the minimum, supported Go version.
# Note: Enforce only the minor version as we can't guarantee that
# the images we use in ProwJobs already use the latest patch version.
MIN_GO_VERSION="go${MIN_GO_VERSION:-1.20}"
MIN_GO_VERSION="go${MIN_GO_VERSION:-1.21}"

# Ensure the go tool exists and is a viable version.
verify_go_version() {
Expand Down
2 changes: 1 addition & 1 deletion test/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module sigs.k8s.io/cluster-api-provider-vsphere/test

go 1.20
go 1.21

replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.6.1

Expand Down
33 changes: 33 additions & 0 deletions test/go.sum

Large diffs are not rendered by default.

0 comments on commit e5c34ae

Please sign in to comment.