Merge pull request #1011 from prometheus/fabxc/travis

simplify travis

.travis.yml

@@ -1,12 +1,9 @@
-# We use native code.
-
 sudo: false
 
 language: go
 
 go:
- - 1.1
+- 1.4
 
 script:
- - cd ${TRAVIS_BUILD_DIR}
- - bash -l ./travis-helper.sh
+- make -f Makefile

travis-helper.sh

@@ -1,19 +0,0 @@
-#!/bin/bash
-
-# Copyright 2013 The Prometheus Authors
-# 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.
-
-# A helper until https://github.com/travis-ci/travis-cookbooks/issues/184 is
-# remedied.
-
-make -f Makefile || exit 1