Skip to content

K
k3s
Commit bd23931a authored by Mike Danese's avatar Mike Danese
Browse files
Options

ignore BUILD files in staging

parent 981dd8dc
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
staging/copy.sh
View file @ bd23931a
...@@ -206,7 +206,6 @@ find "${CLIENT_REPO_TEMP}" -type f -name "*.go" -print0 | xargs -0 gofmt -w ...@@ -206,7 +206,6 @@ find "${CLIENT_REPO_TEMP}" -type f -name "*.go" -print0 | xargs -0 gofmt -w
echo "remove black listed files" echo "remove black listed files"
find "${CLIENT_REPO_TEMP}" -type f \( \ find "${CLIENT_REPO_TEMP}" -type f \( \
-name "*BUILD" -o \
-name "*.json" -not -name "Godeps.json" -o \ -name "*.json" -not -name "Godeps.json" -o \
-name "*.yaml" -o \ -name "*.yaml" -o \
-name "*.yml" -o \ -name "*.yml" -o \
...@@ -217,7 +216,8 @@ if [ "${FAIL_ON_CHANGES}" = true ]; then ...@@ -217,7 +216,8 @@ if [ "${FAIL_ON_CHANGES}" = true ]; then
echo "running FAIL_ON_CHANGES" echo "running FAIL_ON_CHANGES"
# ignore base.go in diff # ignore base.go in diff
cp "${CLIENT_REPO}/pkg/version/base.go" "${CLIENT_REPO_TEMP}/pkg/version/" 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 # TODO(mikedanese): figure out what to do with BUILD files here
if diff -NauprB -x '*BUILD' -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
......
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