From 18eeabadbf1dcf22449662c23dd3341f5eeeb7a7 Mon Sep 17 00:00:00 2001 From: knative-automation Date: Thu, 10 Jun 2021 13:15:43 -0700 Subject: [PATCH] upgrade to latest dependencies (#3749) bumping knative.dev/hack de04b70...e35bcb8: > e35bcb8 Rollback random GOBIN and make it relative to GOPATH again (# 73) > 1c52c48 Skip GOPATH hacks if the repository is already on GOPATH (# 72) Signed-off-by: Knative Automation --- go.mod | 2 +- go.sum | 4 ++-- vendor/github.com/kelseyhightower/envconfig/README.md | 2 +- vendor/go.uber.org/atomic/README.md | 4 ++-- vendor/gopkg.in/go-playground/webhooks.v3/README.md | 2 +- vendor/knative.dev/hack/codegen-library.sh | 2 +- vendor/knative.dev/hack/library.sh | 6 ++++++ vendor/modules.txt | 2 +- 8 files changed, 15 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 20a6b446f..edea87b2f 100644 --- a/go.mod +++ b/go.mod @@ -30,7 +30,7 @@ require ( gopkg.in/go-playground/webhooks.v3 v3.13.0 gopkg.in/yaml.v2 v2.3.0 honnef.co/go/tools v0.0.1-2020.1.5 // indirect - knative.dev/hack v0.0.0-20210601210329-de04b70e00d0 + knative.dev/hack v0.0.0-20210609124042-e35bcb8f21ec ) replace go.opencensus.io => go.opencensus.io v0.20.2 diff --git a/go.sum b/go.sum index accf40c80..f2c8baad6 100644 --- a/go.sum +++ b/go.sum @@ -539,8 +539,8 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.5 h1:nI5egYTGJakVyOryqLs1cQO5dO0ksin5XXs2pspk75k= honnef.co/go/tools v0.0.1-2020.1.5/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -knative.dev/hack v0.0.0-20210601210329-de04b70e00d0 h1:GXGtVDptFpq2aFTh/m+Xii0kvGIcGZQQtx/sHinZqZs= -knative.dev/hack v0.0.0-20210601210329-de04b70e00d0/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= +knative.dev/hack v0.0.0-20210609124042-e35bcb8f21ec h1:6+/kYzOv4SSgzvJer3fZS22pzXQG0haZdue2FsheNrM= +knative.dev/hack v0.0.0-20210609124042-e35bcb8f21ec/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/vendor/github.com/kelseyhightower/envconfig/README.md b/vendor/github.com/kelseyhightower/envconfig/README.md index 6fe2bed32..33408d645 100644 --- a/vendor/github.com/kelseyhightower/envconfig/README.md +++ b/vendor/github.com/kelseyhightower/envconfig/README.md @@ -136,7 +136,7 @@ If envconfig can't find an environment variable in the form `PREFIX_MYVAR`, and is a struct tag defined, it will try to populate your variable with an environment variable that directly matches the envconfig tag in your struct definition: -```bash +```shell export SERVICE_HOST=127.0.0.1 export MYAPP_DEBUG=true ``` diff --git a/vendor/go.uber.org/atomic/README.md b/vendor/go.uber.org/atomic/README.md index 2d893ad44..ade0c20f1 100644 --- a/vendor/go.uber.org/atomic/README.md +++ b/vendor/go.uber.org/atomic/README.md @@ -4,7 +4,7 @@ Simple wrappers for primitive types to enforce atomic access. ## Installation -```bash +```shell $ go get -u go.uber.org/atomic@v1 ``` @@ -25,7 +25,7 @@ replace github.com/uber-go/atomic => github.com/uber-go/atomic v1.4.0 You can do so automatically by running the following command. -```bash +```shell $ go mod edit -replace github.com/uber-go/atomic=github.com/uber-go/atomic@v1.4.0 ``` diff --git a/vendor/gopkg.in/go-playground/webhooks.v3/README.md b/vendor/gopkg.in/go-playground/webhooks.v3/README.md index 0226c6674..53bac3771 100644 --- a/vendor/gopkg.in/go-playground/webhooks.v3/README.md +++ b/vendor/gopkg.in/go-playground/webhooks.v3/README.md @@ -23,7 +23,7 @@ Installation Use go get. -```bash +```shell go get -u gopkg.in/go-playground/webhooks.v3 ``` diff --git a/vendor/knative.dev/hack/codegen-library.sh b/vendor/knative.dev/hack/codegen-library.sh index ae5130f32..d9cf1ce7e 100644 --- a/vendor/knative.dev/hack/codegen-library.sh +++ b/vendor/knative.dev/hack/codegen-library.sh @@ -25,9 +25,9 @@ else exit fi +export MODULE_NAME=$(go_mod_module_name) export GOPATH=$(go_mod_gopath_hack) export GOBIN=${GOPATH}/bin # Set GOBIN explicitly as deepcopy-gen is installed by go install. -export MODULE_NAME=$(go_mod_module_name) export CODEGEN_PKG=${CODEGEN_PKG:-$(cd ${REPO_ROOT_DIR}; ls -d -1 ./vendor/k8s.io/code-generator 2>/dev/null || echo ../code-generator)} export KNATIVE_CODEGEN_PKG=${KNATIVE_CODEGEN_PKG:-$(cd ${REPO_ROOT_DIR}; ls -d -1 ./vendor/knative.dev/pkg 2>/dev/null || echo "${REPO_ROOT_DIR}")} diff --git a/vendor/knative.dev/hack/library.sh b/vendor/knative.dev/hack/library.sh index de744c1d9..fb41fd963 100644 --- a/vendor/knative.dev/hack/library.sh +++ b/vendor/knative.dev/hack/library.sh @@ -611,6 +611,12 @@ function go_mod_module_name() { # Intended to be used like: # export GOPATH=$(go_mod_gopath_hack) function go_mod_gopath_hack() { + # Skip this if the directory is already checked out onto the GOPATH. + if [[ "${REPO_ROOT_DIR##$(go env GOPATH)}" != "$REPO_ROOT_DIR" ]]; then + go env GOPATH + return + fi + local TMP_DIR="$(mktemp -d)" local TMP_REPO_PATH="${TMP_DIR}/src/$(go_mod_module_name)" mkdir -p "$(dirname "${TMP_REPO_PATH}")" && ln -s "${REPO_ROOT_DIR}" "${TMP_REPO_PATH}" diff --git a/vendor/modules.txt b/vendor/modules.txt index a94e12e5c..d3a54c285 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -286,7 +286,7 @@ gopkg.in/go-playground/webhooks.v3/github gopkg.in/yaml.v2 # honnef.co/go/tools v0.0.1-2020.1.5 ## explicit -# knative.dev/hack v0.0.0-20210601210329-de04b70e00d0 +# knative.dev/hack v0.0.0-20210609124042-e35bcb8f21ec ## explicit knative.dev/hack # go.opencensus.io => go.opencensus.io v0.20.2