-
Notifications
You must be signed in to change notification settings - Fork 74
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Some operations are sensitive to the version of Go that is used. In the past, formatting of source differed depending on the version. Right now it is the content of the vendor directory which changes when switch back and forth between 1.12 and 1.13. We don't want to impose a certain workflow on developers, like forcing all invocations of Go to run inside a container. If developers want that, they can set up their development environment accordingly. But we should warn about this aspect to raise awareness. "make" invocations which involve Go now compare against the projects Go version (specified in travis.yml) once at the beginning. This is only a warning because we don't know which future version will be compatible with the project. Vendor directory handling gets updated, too: verification is now a separate script (became too complex for make) and there is a corresponding "update-vendor.sh". In contrast to verification, updating vendor is not integrated into make and thus itself invokes the go version check.
- Loading branch information
Showing
4 changed files
with
145 additions
and
39 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| # Copyright 2019 The Kubernetes Authors. | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| if [ -f Gopkg.toml ]; then | ||
| echo "Repo uses 'dep' for vendoring." | ||
| (set -x; dep ensure) | ||
| elif [ -f go.mod ]; then | ||
| release-tools/verify-go-version.sh "go" | ||
| (set -x; env GO111MODULE=on go mod tidy && env GO111MODULE=on go mod vendor) | ||
| fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| # Copyright 2019 The Kubernetes Authors. | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| GO="$1" | ||
|
|
||
| if [ ! "$GO" ]; then | ||
| echo >&2 "usage: $0 <path to go binary>" | ||
| exit 1 | ||
| fi | ||
|
|
||
| die () { | ||
| echo "ERROR: $*" | ||
| exit 1 | ||
| } | ||
|
|
||
| version=$("$GO" version) || die "determining version of $GO failed" | ||
| # shellcheck disable=SC2001 | ||
| majorminor=$(echo "$version" | sed -e 's/.*go\([0-9]*\)\.\([0-9]*\).*/\1.\2/') | ||
| # shellcheck disable=SC2001 | ||
| expected=$(grep "^ *- go:" "release-tools/travis.yml" | sed -e 's/.*go: *\([0-9]*\)\.\([0-9]*\).*/\1.\2/') | ||
|
|
||
| if [ "$majorminor" != "$expected" ]; then | ||
| cat >&2 <<EOF | ||
| ====================================================== | ||
| WARNING | ||
| This projects is tested with Go v$expected. | ||
| Your current Go version is v$majorminor. | ||
| This may or may not be close enough. | ||
| In particular test-gofmt and test-vendor | ||
| are known to be sensitive to the version of | ||
| Go. | ||
| ====================================================== | ||
| EOF | ||
| fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| # Copyright 2019 The Kubernetes Authors. | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| if [ -f Gopkg.toml ]; then | ||
| echo "Repo uses 'dep' for vendoring." | ||
| case "$(dep version 2>/dev/null | grep 'version *:')" in | ||
| *v0.[56789]*) | ||
| if dep check; then | ||
| echo "vendor up-to-date" | ||
| else | ||
| exit 1 | ||
| fi | ||
| ;; | ||
| *) echo "skipping check, dep >= 0.5 required";; | ||
| esac | ||
| elif [ -f go.mod ]; then | ||
| echo "Repo uses 'go mod'." | ||
| # shellcheck disable=SC2235 | ||
| if [ "${JOB_NAME}" ] && | ||
| ( [ "${JOB_TYPE}" != "presubmit" ] || | ||
| [ "$( (git diff "${PULL_BASE_SHA}..HEAD" -- go.mod go.sum vendor release-tools; | ||
| git diff "${PULL_BASE_SHA}..HEAD" | grep -e '^@@.*@@ import (' -e '^[+-]import') | | ||
| wc -l)" -eq 0 ] ); then | ||
| echo "Skipping vendor check because the Prow pre-submit job does not affect dependencies." | ||
| elif ! (set -x; env GO111MODULE=on go mod tidy); then | ||
| echo "ERROR: vendor check failed." | ||
| exit 1 | ||
| elif [ "$(git status --porcelain -- go.mod go.sum | wc -l)" -gt 0 ]; then | ||
| echo "ERROR: go module files *not* up-to-date, they did get modified by 'GO111MODULE=on go mod tidy':"; | ||
| git diff -- go.mod go.sum | ||
| exit 1 | ||
| elif [ -d vendor ]; then | ||
| if ! (set -x; env GO111MODULE=on go mod vendor); then | ||
| echo "ERROR: vendor check failed." | ||
| exit 1 | ||
| elif [ "$(git status --porcelain -- vendor | wc -l)" -gt 0 ]; then | ||
| echo "ERROR: vendor directory *not* up-to-date, it did get modified by 'GO111MODULE=on go mod vendor':" | ||
| git status -- vendor | ||
| git diff -- vendor | ||
| exit 1 | ||
| else | ||
| echo "Go dependencies and vendor directory up-to-date." | ||
| fi | ||
| else | ||
| echo "Go dependencies up-to-date." | ||
| fi | ||
| fi |