travis: match gonum/gonum formatting checks

gonum · Mar 30, 2019 · 6055bac · 6055bac
1 parent 894f385
commit 6055bac
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -66,9 +66,9 @@ install:
  - travis_wait 20 ${TRAVIS_BUILD_DIR}/.travis/$TRAVIS_OS_NAME/$BLAS_LIB/install.sh
 
 script:
- - ${TRAVIS_BUILD_DIR}/.travis/check-imports.sh
  - ${TRAVIS_BUILD_DIR}/.travis/check-copyright.sh
+ - ${TRAVIS_BUILD_DIR}/.travis/check-imports.sh
+ - ${TRAVIS_BUILD_DIR}/.travis/check-formatting.sh
  - ${TRAVIS_BUILD_DIR}/.travis/$TRAVIS_OS_NAME/$BLAS_LIB/test.sh
- - test -z "$(gofmt -d .)"
  # This is run last since it alters the tree.
  - ${TRAVIS_BUILD_DIR}/.travis/check-generate.sh
diff --git a/.travis/check-formatting.sh b/.travis/check-formatting.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+test -z "$(goimports -d .)"
+if [[ -n "$(gofmt -s -l .)" ]]; then
+	echo -e '\e[31mCode not gofmt simplified in:\n\n'
+	gofmt -s -l .
+	echo -e "\e[0"
+fi
diff --git a/.travis/check-generate.sh b/.travis/check-generate.sh
@@ -7,5 +7,6 @@ go generate gonum.org/v1/netlib/lapack/netlib
 
 git checkout -- go.{mod,sum}
 if [ -n "$(git diff)" ]; then
+	git diff
 	exit 1
 fi