Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix godep verify to use godep restore script #48653

Merged
merged 2 commits into from Jul 8, 2017
Merged

Fix godep verify to use godep restore script #48653

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b111c5
Run verify-godeps.sh fully if hack/ dir changes
cblecker Jul 8, 2017
8b3bf13
Fix godep verify to use godep restore script
cblecker Jul 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 4 additions & 8 deletions hack/verify-godeps.sh
View file
Open in desktop
Expand Up @@ -48,7 +48,8 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
readonly branch=${1:-${KUBE_VERIFY_GIT_BRANCH:-master}}
if ! [[ ${KUBE_FORCE_VERIFY_CHECKS:-} =~ ^[yY]$ ]] && \
! kube::util::has_changes_against_upstream_branch "${branch}" 'Godeps/' && \
! kube::util::has_changes_against_upstream_branch "${branch}" 'vendor/'; then
! kube::util::has_changes_against_upstream_branch "${branch}" 'vendor/' && \
! kube::util::has_changes_against_upstream_branch "${branch}" 'hack/'; then
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this adds ~15 minutes to the verify job for any PR that touches anything in hack... can we target this to things that touched a godep-related script under hack?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

opened #50418

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about caching? @cblecker didn't we introduce a way for caching?

exit 0
fi

Expand Down Expand Up @@ -85,13 +86,8 @@ _kubetmp="${_kubetmp}/kubernetes"
export GOPATH="${_tmpdir}"

pushd "${_kubetmp}" 2>&1 > /dev/null
kube::util::ensure_godep_version v79

export GOPATH="${GOPATH}:${_kubetmp}/staging"
# Fill out that nice clean place with the kube godeps
echo "Starting to download all kubernetes godeps. This takes a while"
godep restore
echo "Download finished"
# Restore the Godeps into our temp directory
hack/godep-restore.sh

# Destroy deps in the copy of the kube tree
rm -rf ./Godeps ./vendor
Expand Down