mirror of
https://github.com/kubernetes/kubernetes.git
synced 2026-06-13 19:01:10 -04:00
Disable the test-owners verify step until the merge conflicts are resolved.
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:
parent
7747f5eefd
commit
57a152ca40
1 changed files with 2 additions and 0 deletions
|
|
@ -20,8 +20,10 @@ set -o pipefail
|
|||
export KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
|
||||
source "${KUBE_ROOT}/hack/lib/init.sh"
|
||||
|
||||
|
||||
cd "${KUBE_ROOT}"
|
||||
if ! hack/update_owners.py --check; then
|
||||
echo 'Run ./hack/update_owners.py to fix it'
|
||||
exit # TODO(rmmh): fix Github merging to respect .gitattributes
|
||||
exit 1
|
||||
fi
|
||||
|
|
|
|||
Loading…
Reference in a new issue