kubernetes
/
autoscaler
mirror of https://github.com/kubernetes/autoscaler.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2778 from losipiuk/lukaszos/tweaks-to-update-vendor-sh-9fb63 

Tweaks to update-vendor.sh
This commit is contained in:
Kubernetes Prow Robot 2020-01-29 04:02:14 -08:00 committed by GitHub
parent 7267e40387 451015620e
commit 2c81caabb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cluster-autoscaler/hack/update-vendor.sh
View File

@ -20,6 +20,7 @@ K8S_FORK="git@github.com:kubernetes/kubernetes.git"
K8S_REV="master"
BATCH_MODE="false"
TARGET_MODULE=${TARGET_MODULE:-k8s.io/autoscaler/cluster-autoscaler}
VERIFY_COMMAND=${VERIFY_COMMAND:-"go test -mod=vendor ./..."}
ARGS="$@"
OPTS=`getopt -o f::r::d::v::b:: --long k8sfork::,k8srev::,workdir::,batch:: -n $SCRIPT_NAME -- "$@"`
@ -130,8 +131,9 @@ set +o errexit
test "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1";
}
GO_MOD_EXTRA_FILES="$(shopt -s nullglob;echo go.mod-extra*)"
OLD_EXTRA_FOUND="false"
for go_mod_extra in go.mod-extra*; do
for go_mod_extra in ${GO_MOD_EXTRA_FILES}; do
list_dependencies ${go_mod_extra} | while read extra_path extra_version; do
list_dependencies go.mod | while read source_path source_version; do
if [[ "${source_path}" == "${extra_path}" ]]; then
@ -149,7 +151,7 @@ set +o errexit
# Add dependencies from go.mod-extra to go.mod
# Propagate require entries to both require and replace
for go_mod_extra in go.mod-extra*; do
for go_mod_extra in ${GO_MOD_EXTRA_FILES}; do
go mod edit -json ${go_mod_extra} | jq -r '.Require[]? | "-require \(.Path)@\(.Version)"' | xargs -t -r go mod edit >&${BASH_XTRACEFD} 2>&1
go mod edit -json ${go_mod_extra} | jq -r '.Require[]? | "-replace \(.Path)=\(.Path)@\(.Version)"' | xargs -t -r go mod edit >&${BASH_XTRACEFD} 2>&1
# And add explicit replace entries
@ -179,9 +181,9 @@ set +o errexit
echo "Running go mod vendor"
go mod vendor
echo "Running go test -mod=vendor ./..."
if ! go test -mod=vendor ./... >&${BASH_XTRACEFD} 2>&1; then
err_rerun "Test run failed"
echo "Running ${VERIFY_COMMAND}"
if ! ${VERIFY_COMMAND} >&${BASH_XTRACEFD} 2>&1; then
err_rerun "Verify command failed"
fi
# Commit go.mod* and vendor