From 93541aa05b72e2a6b439bb488b42128ef8fa0085 Mon Sep 17 00:00:00 2001 From: Rafael Fonseca Date: Sat, 25 May 2024 15:25:54 +0200 Subject: [PATCH] hack: bump golang to 1.22 --- hack/build-node-joiner.sh | 2 +- hack/build.sh | 2 +- hack/go-fmt.sh | 2 +- hack/go-genmock.sh | 2 +- hack/go-sec.sh | 2 +- hack/go-test.sh | 2 +- hack/go-vet.sh | 2 +- hack/verify-codegen.sh | 2 +- hack/verify-vendor.sh | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/hack/build-node-joiner.sh b/hack/build-node-joiner.sh index 8837b05d8f..3ccc9ee526 100755 --- a/hack/build-node-joiner.sh +++ b/hack/build-node-joiner.sh @@ -5,7 +5,7 @@ set -ex # shellcheck disable=SC2068 version() { IFS="."; printf "%03d%03d%03d\\n" $@; unset IFS;} -minimum_go_version=1.21 +minimum_go_version=1.22 current_go_version=$(go version | cut -d " " -f 3) if [ "$(version "${current_go_version#go}")" -lt "$(version "$minimum_go_version")" ]; then diff --git a/hack/build.sh b/hack/build.sh index 8ad92142d9..f3ae277aaa 100755 --- a/hack/build.sh +++ b/hack/build.sh @@ -61,7 +61,7 @@ build_terraform_and_providers() { fi } -minimum_go_version=1.21 +minimum_go_version=1.22 current_go_version=$(go version | cut -d " " -f 3) if [ "$(version "${current_go_version#go}")" -lt "$(version "$minimum_go_version")" ]; then diff --git a/hack/go-fmt.sh b/hack/go-fmt.sh index 01d1739c9b..d492e7fc7b 100755 --- a/hack/go-fmt.sh +++ b/hack/go-fmt.sh @@ -11,6 +11,6 @@ else --env IS_CONTAINER=TRUE \ --volume "${PWD}:/go/src/github.com/openshift/installer:z" \ --workdir /go/src/github.com/openshift/installer \ - docker.io/golang:1.21 \ + docker.io/golang:1.22 \ ./hack/go-fmt.sh "${@}" fi diff --git a/hack/go-genmock.sh b/hack/go-genmock.sh index 20fab4ca00..ca5b8c21b1 100755 --- a/hack/go-genmock.sh +++ b/hack/go-genmock.sh @@ -10,6 +10,6 @@ else --env IS_CONTAINER=TRUE \ --volume "${PWD}:/go/src/github.com/openshift/installer:z" \ --workdir /go/src/github.com/openshift/installer \ - docker.io/golang:1.21 \ + docker.io/golang:1.22 \ ./hack/go-genmock.sh "${@}" fi diff --git a/hack/go-sec.sh b/hack/go-sec.sh index df17347644..a45aa6a7d6 100755 --- a/hack/go-sec.sh +++ b/hack/go-sec.sh @@ -12,6 +12,6 @@ else --env IS_CONTAINER=TRUE \ --volume "${PWD}:/go/src/github.com/openshift/installer:z" \ --workdir /go/src/github.com/openshift/installer \ - docker.io/golang:1.21 \ + docker.io/golang:1.22 \ ./hack/go-sec.sh "${@}" fi diff --git a/hack/go-test.sh b/hack/go-test.sh index ad593249e4..d4897d0c03 100755 --- a/hack/go-test.sh +++ b/hack/go-test.sh @@ -8,6 +8,6 @@ else --env IS_CONTAINER=TRUE \ --volume "${PWD}:/go/src/github.com/openshift/installer:z" \ --workdir /go/src/github.com/openshift/installer \ - docker.io/golang:1.21 \ + docker.io/golang:1.22 \ ./hack/go-test.sh "${@}" fi diff --git a/hack/go-vet.sh b/hack/go-vet.sh index d7afd57c64..6345a980d8 100755 --- a/hack/go-vet.sh +++ b/hack/go-vet.sh @@ -6,6 +6,6 @@ else --env IS_CONTAINER=TRUE \ --volume "${PWD}:/go/src/github.com/openshift/installer:z" \ --workdir /go/src/github.com/openshift/installer \ - docker.io/golang:1.21 \ + docker.io/golang:1.22 \ ./hack/go-vet.sh "${@}" fi; diff --git a/hack/verify-codegen.sh b/hack/verify-codegen.sh index bc6b50f1a6..65707c1e35 100755 --- a/hack/verify-codegen.sh +++ b/hack/verify-codegen.sh @@ -10,6 +10,6 @@ else --env IS_CONTAINER=TRUE \ --volume "${PWD}:/go/src/github.com/openshift/installer:z" \ --workdir /go/src/github.com/openshift/installer \ - docker.io/golang:1.21 \ + docker.io/golang:1.22 \ ./hack/verify-codegen.sh "${@}" fi diff --git a/hack/verify-vendor.sh b/hack/verify-vendor.sh index 2343a3aa55..81cf915858 100755 --- a/hack/verify-vendor.sh +++ b/hack/verify-vendor.sh @@ -39,6 +39,6 @@ else --env IS_CONTAINER=TRUE \ --volume "${PWD}:/go/src/github.com/openshift/installer:z" \ --workdir /go/src/github.com/openshift/installer \ - docker.io/golang:1.21 \ + docker.io/golang:1.22 \ ./hack/verify-vendor.sh "${@}" fi