Disable gofmt for non go1.2 or go1.3

duda · Jul 1, 2014 · e5f36b8 · e5f36b8
1 parent d75bd79
commit e5f36b8
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -3,11 +3,12 @@ language: go
 go:
   - 1.2
   - 1.3
+  - tip
 
 install: 
   - go get code.google.com/p/go.tools/cmd/cover
   - go get github.com/coreos/etcd
-  - bad=$(gofmt -s -l pkg/ cmd/) bash -x -c '[[ -z "$bad" ]]'
+  - ./hack/verify-gofmt.sh
   - ./hack/verify-boilerplate.sh
   - ./hack/build-go.sh
 

diff --git a/hack/verify-gofmt.sh b/hack/verify-gofmt.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# Copyright 2014 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# GoFmt apparently is changing @ head...
+
+GO_VERSION=($(go version))
+echo "Detected go version: $(go version)"
+
+if [[ ${GO_VERSION[2]} != "go1.2" && ${GO_VERSION[2]} != "go1.3" ]]; then
+  echo "Unknown go version, skipping gofmt."
+  exit 0
+fi
+
+
+bad=$(gofmt -s -l pkg/ cmd/)
+if [ "$?" != "0" ]; then
+  echo "$bad"
+  exit 1
+fi