Skip to content

Commit dd528f2

Browse files
committed
Squashed 'release-tools/' changes from 335339f0..37d11049
kubernetes-csi/csi-release-tools@37d11049 Merge kubernetes-csi/csi-release-tools#191 from pohly/go-1.18 kubernetes-csi/csi-release-tools@db917f5c update to Go 1.18 git-subtree-dir: release-tools git-subtree-split: 37d1104926b30aa0544abb5a16c980ba82aaa585
1 parent 40e572a commit dd528f2

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

prow.sh

+2-5
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
@@ -441,10 +441,7 @@ install_ginkgo () {
441441
if [ "v$(ginkgo version 2>/dev/null | sed -e 's/.* //')" = "${CSI_PROW_GINKGO_VERSION}" ]; then
442442
return
443443
fi
444-
git_checkout https://github.com/onsi/ginkgo "$GOPATH/src/github.com/onsi/ginkgo" "${CSI_PROW_GINKGO_VERSION}" --depth=1 &&
445-
# 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}"
444+
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"
448445
}
449446

450447
# Ensure that we have the desired version of dep.

verify-spelling.sh

+1-1
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)