Skip to content

Commit 90a11e7

Browse files
committed
update to Go 1.18
This is the latest stable release and the one used by Kubernetes 1.24.
1 parent 335339f commit 90a11e7

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

prow.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ configvar CSI_PROW_BUILD_PLATFORMS "linux amd64 amd64; linux ppc64le ppc64le -pp
8686
# which is disabled with GOFLAGS=-mod=vendor).
8787
configvar GOFLAGS_VENDOR "$( [ -d vendor ] && echo '-mod=vendor' )" "Go flags for using the vendor directory"
8888

89-
configvar CSI_PROW_GO_VERSION_BUILD "1.17.3" "Go version for building the component" # depends on component's source code
89+
configvar CSI_PROW_GO_VERSION_BUILD "1.18" "Go version for building the component" # depends on component's source code
9090
configvar CSI_PROW_GO_VERSION_E2E "" "override Go version for building the Kubernetes E2E test suite" # normally doesn't need to be set, see install_e2e
9191
configvar CSI_PROW_GO_VERSION_SANITY "${CSI_PROW_GO_VERSION_BUILD}" "Go version for building the csi-sanity test suite" # depends on CSI_PROW_SANITY settings below
9292
configvar CSI_PROW_GO_VERSION_KIND "${CSI_PROW_GO_VERSION_BUILD}" "Go version for building 'kind'" # depends on CSI_PROW_KIND_VERSION below
@@ -443,8 +443,7 @@ install_ginkgo () {
443443
fi
444444
git_checkout https://github.com/onsi/ginkgo "$GOPATH/src/github.com/onsi/ginkgo" "${CSI_PROW_GINKGO_VERSION}" --depth=1 &&
445445
# We have to get dependencies and hence can't call just "go build".
446-
run_with_go "${CSI_PROW_GO_VERSION_GINKGO}" go get github.com/onsi/ginkgo/ginkgo || die "building ginkgo failed" &&
447-
mv "$GOPATH/bin/ginkgo" "${CSI_PROW_BIN}"
446+
run_with_go "${CSI_PROW_GO_VERSION_GINKGO}" env GOBIN="${CSI_PROW_BIN}" go install "github.com/onsi/ginkgo/ginkgo@"${CSI_PROW_GINKGO_VERSION}" || die "building ginkgo failed"
448447
}
449448
450449
# Ensure that we have the desired version of dep.

verify-spelling.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ if [[ -z "$(command -v misspell)" ]]; then
4141
# perform go get in a temp dir as we are not tracking this version in a go module
4242
# if we do the go get in the repo, it will create / update a go.mod and go.sum
4343
cd "${TMP_DIR}"
44-
GO111MODULE=on GOBIN="${TMP_DIR}" go get "github.com/client9/misspell/cmd/misspell@${TOOL_VERSION}"
44+
GO111MODULE=on GOBIN="${TMP_DIR}" go install "github.com/client9/misspell/cmd/misspell@${TOOL_VERSION}"
4545
export PATH="${TMP_DIR}:${PATH}"
4646
fi
4747

0 commit comments

Comments
 (0)