Skip to content

K
k3s
Commit 57a152ca authored by Ryan Hitchman's avatar Ryan Hitchman
Browse files
Options

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.
parent 7747f5ee
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
hack/verify-test-owners.sh
View file @ 57a152ca
...@@ -20,8 +20,10 @@ set -o pipefail ...@@ -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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment