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

Disable the test-owners verify step until the merge conflicts are resolved.

Browse Source 
Fixes #35850.

GitHub's merging doesn't support .gitattributes-- I verified this with
support. There may be a workaround with line padding or making the bot
do merges on its own, which is beneficial for custom merge conflict
resolution in general.
This commit is contained in:
Ryan Hitchman 2016-11-02 14:51:29 -07:00
parent 7747f5eefd
commit 57a152ca40
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/verify-test-owners.sh
View File

@ -20,8 +20,10 @@ set -o pipefail
export KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. export KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/init.sh"
cd "${KUBE_ROOT}" cd "${KUBE_ROOT}"
if ! hack/update_owners.py --check; then if ! hack/update_owners.py --check; then
echo 'Run ./hack/update_owners.py to fix it' echo 'Run ./hack/update_owners.py to fix it'
exit # TODO(rmmh): fix Github merging to respect .gitattributes
exit 1 exit 1
fi fi