From 74ab8729274b751b74855a0f3d8a97a1de477689 Mon Sep 17 00:00:00 2001 From: Christoph Blecker Date: Wed, 22 Mar 2017 07:53:31 -0700 Subject: [PATCH] Ignore GoVersion and GodepVersion in staging-godep diff --- hack/update-staging-godeps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/update-staging-godeps.sh b/hack/update-staging-godeps.sh index 94f7a6b1901..e6d9e8c3bce 100755 --- a/hack/update-staging-godeps.sh +++ b/hack/update-staging-godeps.sh @@ -99,7 +99,7 @@ for repo in $(ls ${KUBE_ROOT}/staging/src/k8s.io); do updateGodepManifest "${repo}" if [ "${FAIL_ON_DIFF}" == true ]; then - diff --ignore-matching-lines='^\s*\"Comment\"' -u "${KUBE_ROOT}/staging/src/k8s.io/${repo}/Godeps" "${TMP_GOPATH}/src/k8s.io/${repo}/Godeps/Godeps.json" + diff --ignore-matching-lines='^\s*\"GoVersion\":' --ignore-matching-line='^\s*\"GodepVersion\":' --ignore-matching-lines='^\s*\"Comment\"' -u "${KUBE_ROOT}/staging/src/k8s.io/${repo}/Godeps" "${TMP_GOPATH}/src/k8s.io/${repo}/Godeps/Godeps.json" fi if [ "${DRY_RUN}" != true ]; then cp "${TMP_GOPATH}/src/k8s.io/${repo}/Godeps/Godeps.json" "${KUBE_ROOT}/staging/src/k8s.io/${repo}/Godeps"