Skip to content

Commit 31030ff

Browse files
authored
Merge pull request #105 from pohly/prow-update-master
master: update release-tools
2 parents 73239a6 + 01a02d3 commit 31030ff

File tree

4 files changed

+6
-12
lines changed

4 files changed

+6
-12
lines changed

.github/workflows/golangci-lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ jobs:
2121
uses: golangci/golangci-lint-action@v2
2222
with:
2323
# Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
24-
version: v1.43
24+
version: v1.45.2
2525

2626
# Optional: working directory, useful for monorepos
2727
# working-directory: somedir
2828

2929
# Optional: golangci-lint command line arguments.
30-
# args: --issues-exit-code=0
30+
args: --timeout=5m
3131

3232
# Optional: show only new issues if it's a pull request. The default value is `false`.
3333
# only-new-issues: true

hack/verify-spelling.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,7 @@ trap exitHandler EXIT
3636

3737
if [[ -z "$(command -v misspell)" ]]; then
3838
echo "Cannot find misspell. Installing misspell..."
39-
# perform go get in a temp dir as we are not tracking this version in a go module
40-
# if we do the go get in the repo, it will create / update a go.mod and go.sum
41-
cd "${TMP_DIR}"
42-
GO111MODULE=on GOBIN="${TMP_DIR}" go get "github.com/client9/misspell/cmd/misspell@${TOOL_VERSION}"
39+
GOBIN="${TMP_DIR}" go install "github.com/client9/misspell/cmd/misspell@${TOOL_VERSION}"
4340
export PATH="${TMP_DIR}:${PATH}"
4441
fi
4542
cd "${ROOT}"

release-tools/prow.sh

Lines changed: 2 additions & 5 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
@@ -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.

release-tools/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)