mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 03:41:45 +00:00
Merge pull request #42300 from caesarxuchao/fix-client-verify
Automatic merge from submit-queue ignore base.go in client-verify We need to cherry-pick it to 1.6 to fix #42290.
This commit is contained in:
commit
93a3efd896
@ -215,8 +215,9 @@ find "${CLIENT_REPO_TEMP}" -type f \( \
|
|||||||
|
|
||||||
if [ "${FAIL_ON_CHANGES}" = true ]; then
|
if [ "${FAIL_ON_CHANGES}" = true ]; then
|
||||||
echo "running FAIL_ON_CHANGES"
|
echo "running FAIL_ON_CHANGES"
|
||||||
ret=0
|
# ignore base.go in diff
|
||||||
if diff --ignore-matching-lines='^\s*\"Comment\"' -NauprB -I "GoVersion.*\|GodepVersion.*" "${CLIENT_REPO}" "${CLIENT_REPO_TEMP}"; then
|
cp "${CLIENT_REPO}/pkg/version/base.go" "${CLIENT_REPO_TEMP}/pkg/version/"
|
||||||
|
if diff -NauprB -I '^\s*\"Comment\"' -I "GoVersion.*\|GodepVersion.*" "${CLIENT_REPO}" "${CLIENT_REPO_TEMP}"; then
|
||||||
echo "${CLIENT_REPO} up to date."
|
echo "${CLIENT_REPO} up to date."
|
||||||
exit 0
|
exit 0
|
||||||
else
|
else
|
||||||
|
Loading…
Reference in New Issue
Block a user