upgrade to latest dependencies (#482)

bumping knative.dev/hack de04b70...1c52c48:
  > 1c52c48 Skip GOPATH hacks if the repository is already on GOPATH (# 72)
bumping knative.dev/pkg 0e61d67...f19eef1:
  > f19eef1 Update actions (# 2142)

Signed-off-by: Knative Automation <automation@knative.team>
This commit is contained in:
knative-automation 2021-06-09 00:01:42 -07:00 committed by GitHub
parent bbf9add633
commit 4db1bf0b96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 9 deletions

4
go.mod
View File

@ -18,6 +18,6 @@ require (
k8s.io/client-go v0.19.7
k8s.io/code-generator v0.19.7
k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6
knative.dev/hack v0.0.0-20210601210329-de04b70e00d0
knative.dev/pkg v0.0.0-20210602095030-0e61d6763dd6
knative.dev/hack v0.0.0-20210608140741-1c52c48385ca
knative.dev/pkg v0.0.0-20210608193741-f19eef192438
)

7
go.sum
View File

@ -1109,10 +1109,11 @@ k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6 h1:+WnxoVtG8TMiudHBSEtrVL
k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o=
k8s.io/utils v0.0.0-20200729134348-d5654de09c73 h1:uJmqzgNWG7XyClnU/mLPBWwfKKF1K8Hf8whTseBgJcg=
k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
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/pkg v0.0.0-20210602095030-0e61d6763dd6 h1:Z0cPPaa6ofJ4qKrMQ8XFE0z3NHuBrxK2szR1d1+7kqA=
knative.dev/pkg v0.0.0-20210602095030-0e61d6763dd6/go.mod h1:/hT1IXHPs8ZwQ8yTJtfaYWpLmsLhC2s6/v/ydF7PoiE=
knative.dev/hack v0.0.0-20210608140741-1c52c48385ca h1:epNt3ijc4sDboZ+2CvaybyriX2ESS/xq4GnTkYWDOw0=
knative.dev/hack v0.0.0-20210608140741-1c52c48385ca/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
knative.dev/pkg v0.0.0-20210608193741-f19eef192438 h1:rzmkYxVQf8Jzj8xe9L1wNrdKcMVXHk84YedMqZFrvUM=
knative.dev/pkg v0.0.0-20210608193741-f19eef192438/go.mod h1:/hT1IXHPs8ZwQ8yTJtfaYWpLmsLhC2s6/v/ydF7PoiE=
pgregory.net/rapid v0.3.3/go.mod h1:UYpPVyjFHzYBGHIxLFoupi8vwk6rXNzRY9OMvVxFIOU=
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=

View File

@ -25,9 +25,9 @@ else
exit
fi
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 GOPATH=$(go_mod_gopath_hack)
export GOBIN="$(mktemp -d)" # Set GOBIN explicitly as deepcopy-gen is installed by go install.
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}")}

View File

@ -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}"

4
vendor/modules.txt vendored
View File

@ -663,10 +663,10 @@ k8s.io/kube-openapi/pkg/util/sets
k8s.io/utils/buffer
k8s.io/utils/integer
k8s.io/utils/trace
# knative.dev/hack v0.0.0-20210601210329-de04b70e00d0
# knative.dev/hack v0.0.0-20210608140741-1c52c48385ca
## explicit
knative.dev/hack
# knative.dev/pkg v0.0.0-20210602095030-0e61d6763dd6
# knative.dev/pkg v0.0.0-20210608193741-f19eef192438
## explicit
knative.dev/pkg/apis
knative.dev/pkg/apis/duck