diff --git a/travis/check-go-mod.sh b/travis/check-go-mod.sh index 1bfc9e91d..a387f30d4 100755 --- a/travis/check-go-mod.sh +++ b/travis/check-go-mod.sh @@ -14,7 +14,9 @@ for i in $(find . -name go.mod -not -path "./hack/*"); do popd done -# verify no changes to go.mods -- these should be part of the PR -find . -name go.sum | xargs git checkout -- -git add . -git diff-index HEAD --exit-code +# Need better check. This is repeated git diff check +# more pain than benefit for most people 25Apr2020 +## verify no changes to go.mods -- these should be part of the PR +# find . -name go.sum | xargs git checkout -- +# git add . +# git diff-index HEAD --exit-code diff --git a/travis/kyaml-pre-commit.sh b/travis/kyaml-pre-commit.sh index 962f5189b..4f1f93f21 100755 --- a/travis/kyaml-pre-commit.sh +++ b/travis/kyaml-pre-commit.sh @@ -26,9 +26,11 @@ for target in $targets; do popd done -# make sure no files were generated or changed by make -# ignore changes to go.mod and go.sum -- they are too flaky -find . -name go.mod | xargs git checkout -- -find . -name go.sum | xargs git checkout -- -git add . -git diff-index HEAD --exit-code +# Need better check. This is repeated git diff check +# more pain than benefit for most people 25Apr2020 +## make sure no files were generated or changed by make +## ignore changes to go.mod and go.sum -- they are too flaky +# find . -name go.mod | xargs git checkout -- +# find . -name go.sum | xargs git checkout -- +# git add . +# git diff-index HEAD --exit-code