Merge pull request openshift#185 from wking/ci-for-root-pkg-directory

hack: Run Go tools over ./...
wking · Aug 28, 2018 · 879a4c9 · 879a4c9
2 parents 245fc0f + dec4f3a
commit 879a4c9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 17 deletions.
diff --git a/hack/go-fmt.sh b/hack/go-fmt.sh
@@ -1,6 +1,4 @@
 #!/bin/sh
-# Example: ./hack/go-lint.sh installer/... tests/smoke
-
 if [ "$IS_CONTAINER" != "" ]; then
   for TARGET in "${@}"; do
     find "${TARGET}" -name '*.go' ! -path '*/vendor/*' ! -path '*/.build/*' -exec gofmt -s -w {} \+

diff --git a/hack/go-lint.sh b/hack/go-lint.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Example:  ./hack/go-lint.sh installer/... tests/smoke
+# Example:  ./hack/go-lint.sh installer/... pkg/... tests/smoke
 
 if [ "$IS_CONTAINER" != "" ]; then
   golint -set_exit_status "${@}"

diff --git a/hack/go-vet.sh b/hack/go-vet.sh
@@ -1,18 +1,6 @@
 #!/bin/sh
 if [ "$IS_CONTAINER" != "" ]; then
-  cd ..
-  SOURCE_DIR="$(pwd)"
-  cd .. || exit
-  ROOT_DIR="$(pwd)"
-  TARGET_DIR="${ROOT_DIR}/openshift"
-  if [ "$SOURCE_DIR" != "$TARGET_DIR" ]; then
-    mv "$SOURCE_DIR" "$TARGET_DIR"
-  fi;
-  cd "${TARGET_DIR}/installer/" || exit
-  go vet "$1"
+  go vet "${@}"
 else
-  for dir in "$@"
-  do
-    docker run --rm --env IS_CONTAINER='TRUE' -v "$PWD":/go/src/github.com/openshift/installer -w /go/src/github.com/openshift/installer quay.io/coreos/golang-testing ./hack/go-vet.sh "$dir"
-  done;
+  docker run --rm --env IS_CONTAINER='TRUE' -v "$PWD":/go/src/github.com/openshift/installer -w /go/src/github.com/openshift/installer quay.io/coreos/golang-testing ./hack/go-vet.sh "${@}"
 fi;