mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 11:50:44 +00:00
Merge pull request #26465 from david-mcmahon/addvendor
Automatic merge from submit-queue Verify changes against upstream vendor/ as well. cc @ixdy
This commit is contained in:
commit
011258917b
@ -333,8 +333,9 @@ kube::util::git_upstream_remote_name() {
|
||||
kube::util::has_changes_against_upstream_branch() {
|
||||
local -r git_branch=$1
|
||||
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}'"
|
||||
# make sure the branch is valid, otherwise the check will pass erroneously.
|
||||
if ! git describe "${full_branch}" >/dev/null; then
|
||||
|
@ -23,7 +23,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/'; then
|
||||
! kube::util::has_changes_against_upstream_branch "${branch}" 'Godeps/' && \
|
||||
! kube::util::has_changes_against_upstream_branch "${branch}" 'vendor/'; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
|
@ -44,7 +44,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/'; then
|
||||
! kube::util::has_changes_against_upstream_branch "${branch}" 'Godeps/' && \
|
||||
! kube::util::has_changes_against_upstream_branch "${branch}" 'vendor/'; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user