github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-17 15:13:08 +00:00
Code Issues Projects Releases Wiki Activity

Make skipping logic more robust in hack/verify-godep*

Browse Source 
Also add an environment variable, KUBE_VERIFY_GIT_BRANCH, used with this
logic.
This commit is contained in:
Jeff Grafton
2016-03-07 18:10:24 -08:00
parent bf3cc9d126
commit 24b3223141
4 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
hack/verify-godeps.sh
View File

@@ -39,9 +39,15 @@ preload-dep() {
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
source "${KUBE_ROOT}/hack/lib/init.sh"
branch="${1:-master}"
readonly branch="origin/${1:-${KUBE_VERIFY_GIT_BRANCH:-master}}"
echo "Checking for Godeps changes against ${branch}"
# make sure the branch is valid, otherwise the next check will pass erroneously.
if ! git describe "${branch}" >/dev/null; then
exit 1
fi
# notice this uses ... to find the first shared ancestor
if ! git diff origin/"${branch}"...HEAD | grep 'Godeps/' > /dev/null; then
if ! git diff --name-only "${branch}...HEAD" | grep 'Godeps/' > /dev/null; then
echo "No Godeps changes detected."
exit 0
fi