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

allow generated changes in readonly package

Browse Source
This commit is contained in:
deads2k 2017-01-11 08:20:22 -05:00
parent a264e5f885
commit 98acd800da
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hack/lib/util.sh
View File

@ -413,11 +413,11 @@ kube::util::has_changes_against_upstream_branch() {
exit 1
fi
# notice this uses ... to find the first shared ancestor
if git diff --name-only "${full_branch}...HEAD" | grep -v "${not_pattern}" | grep "${pattern}" > /dev/null; then
if git diff --name-only "${full_branch}...HEAD" | grep -v -E "${not_pattern}" | grep "${pattern}" > /dev/null; then
return 0
fi
# also check for pending changes
if git status --porcelain | grep -v "${not_pattern}" | grep "${pattern}" > /dev/null; then
if git status --porcelain | grep -v -E "${not_pattern}" | grep "${pattern}" > /dev/null; then
echo "Detected '${pattern}' uncommitted changes."
return 0
fi

2
hack/verify-readonly-packages.sh
View File

@ -45,7 +45,7 @@ find_files() {
IFS=$'\n'
conflicts=($(find_files | sed 's|/.readonly||' | while read dir; do
dir=${dir#./}
if kube::util::has_changes_against_upstream_branch "${branch}" "^${dir}/[^/]*\$" "/.readonly\$" &>/dev/null; then
if kube::util::has_changes_against_upstream_branch "${branch}" "^${dir}/[^/]*\$" "/.readonly\$|/BUILD$|/zz_generated" &>/dev/null; then
echo "${dir}"
fi
done))