diff --git a/Makefile b/Makefile index 628fddada6..4967057364 100644 --- a/Makefile +++ b/Makefile @@ -81,7 +81,7 @@ default: install # Create and update the vendor directory .PHONY: vendor vendor: - go mod tidy -go $(GOVERSION) + go mod tidy -go $(GOVERSION).0 go mod vendor .PHONY: vendorcheck diff --git a/go.mod b/go.mod index 182c705656..f6b9677c5c 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/crc-org/crc/v2 -go 1.21 +go 1.21.0 require ( github.com/AlecAivazis/survey/v2 v2.3.7 diff --git a/tools/go.mod b/tools/go.mod index 255c1df733..564ff99ad5 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -1,6 +1,6 @@ module github.com/crc-org/crc/tools -go 1.21 +go 1.21.0 require ( github.com/cfergeau/gomod2rpmdeps v0.0.0-20210223144124-2042c4850ca8 diff --git a/update-go-version.sh b/update-go-version.sh index 4a046dc54d..14be9b8c10 100755 --- a/update-go-version.sh +++ b/update-go-version.sh @@ -9,8 +9,9 @@ set -euo pipefail golang_base_version=$1 echo "Updating golang version to $golang_base_version" -go mod edit -go ${golang_base_version} -go mod edit -go ${golang_base_version} tools/go.mod +go mod edit -go "${golang_base_version}.0" +go mod edit -go "${golang_base_version}.0" tools/go.mod + sed -i "s,^GOVERSION = 1.[0-9]\+,GOVERSION = ${golang_base_version}," Makefile sed -i "s,^\(FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-\)1.[0-9]\+,\1${golang_base_version}," images/*/Dockerfile sed -i "s,^FROM registry.access.redhat.com/ubi8/go-toolset:[.0-9]\+,FROM registry.access.redhat.com/ubi8/go-toolset:${golang_base_version}," images/*/Dockerfile