mirror of https://github.com/k3s-io/k3s.git
Add more generated files as exceptions for readonly directories
parent
6e5b455b77
commit
1122bf2c58
|
@ -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\$|/BUILD$|/zz_generated" &>/dev/null; then
|
||||
if kube::util::has_changes_against_upstream_branch "${branch}" "^${dir}/[^/]*\$" '/\.readonly$|/BUILD$|/zz_generated|/\.generated\.|\.proto$|\.pb\.go$' >/dev/null; then
|
||||
echo "${dir}"
|
||||
fi
|
||||
done))
|
||||
|
|
Loading…
Reference in New Issue