diff --git a/hack/verify-godeps.sh b/hack/verify-godeps.sh index 8d91a20578a..5037f437606 100755 --- a/hack/verify-godeps.sh +++ b/hack/verify-godeps.sh @@ -25,6 +25,7 @@ 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/' && \ + ! kube::util::has_changes_against_upstream_branch "${branch}" 'hack/lib/' && \ ! kube::util::has_changes_against_upstream_branch "${branch}" 'hack/.*godep'; then exit 0 fi diff --git a/hack/verify-staging-godeps.sh b/hack/verify-staging-godeps.sh index e3d463f9c43..7177ac639e9 100755 --- a/hack/verify-staging-godeps.sh +++ b/hack/verify-staging-godeps.sh @@ -19,4 +19,17 @@ set -o nounset set -o pipefail KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. +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}" 'staging/' && \ + ! kube::util::has_changes_against_upstream_branch "${branch}" 'build/' && \ + ! kube::util::has_changes_against_upstream_branch "${branch}" 'Godeps/' && \ + ! kube::util::has_changes_against_upstream_branch "${branch}" 'vendor/' && \ + ! kube::util::has_changes_against_upstream_branch "${branch}" 'hack/lib/' && \ + ! kube::util::has_changes_against_upstream_branch "${branch}" 'hack/.*godep'; then + exit 0 +fi + KUBE_VERBOSE="${KUBE_VERBOSE:-3}" KUBE_RUN_COPY_OUTPUT=N ${KUBE_ROOT}/hack/update-staging-godeps.sh -d -f "$@"