github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #26465 from david-mcmahon/addvendor

Browse Source 
Automatic merge from submit-queue

Verify changes against upstream vendor/ as well.

cc @ixdy
This commit is contained in:
k8s-merge-robot 2016-05-28 00:43:37 -07:00
commit 011258917b
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hack/lib/util.sh
View File

@ -333,8 +333,9 @@ kube::util::git_upstream_remote_name() {
kube::util::has_changes_against_upstream_branch() { kube::util::has_changes_against_upstream_branch() {
local -r git_branch=$1 local -r git_branch=$1
local -r pattern=$2 local -r pattern=$2
local full_branch
readonly full_branch="$(kube::util::git_upstream_remote_name)/${git_branch}" full_branch="$(kube::util::git_upstream_remote_name)/${git_branch}"
echo "Checking for '${pattern}' changes against '${full_branch}'" echo "Checking for '${pattern}' changes against '${full_branch}'"
# make sure the branch is valid, otherwise the check will pass erroneously. # make sure the branch is valid, otherwise the check will pass erroneously.
if ! git describe "${full_branch}" >/dev/null; then if ! git describe "${full_branch}" >/dev/null; then

3
hack/verify-godep-licenses.sh
View File

@ -23,7 +23,8 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
readonly branch=${1:-${KUBE_VERIFY_GIT_BRANCH:-master}} readonly branch=${1:-${KUBE_VERIFY_GIT_BRANCH:-master}}
if ! [[ ${KUBE_FORCE_VERIFY_CHECKS:-} =~ ^[yY]$ ]] && \ if ! [[ ${KUBE_FORCE_VERIFY_CHECKS:-} =~ ^[yY]$ ]] && \
! kube::util::has_changes_against_upstream_branch "${branch}" 'Godeps/'; then ! kube::util::has_changes_against_upstream_branch "${branch}" 'Godeps/' && \
! kube::util::has_changes_against_upstream_branch "${branch}" 'vendor/'; then
exit 0 exit 0
fi fi

3
hack/verify-godeps.sh
View File

@ -44,7 +44,8 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
readonly branch=${1:-${KUBE_VERIFY_GIT_BRANCH:-master}} readonly branch=${1:-${KUBE_VERIFY_GIT_BRANCH:-master}}
if ! [[ ${KUBE_FORCE_VERIFY_CHECKS:-} =~ ^[yY]$ ]] && \ if ! [[ ${KUBE_FORCE_VERIFY_CHECKS:-} =~ ^[yY]$ ]] && \
! kube::util::has_changes_against_upstream_branch "${branch}" 'Godeps/'; then ! kube::util::has_changes_against_upstream_branch "${branch}" 'Godeps/' && \
! kube::util::has_changes_against_upstream_branch "${branch}" 'vendor/'; then
exit 0 exit 0
fi fi