From 9ded3aea66967eebcc36367ab45904b72cbfd616 Mon Sep 17 00:00:00 2001
From: Simon Pasquier <spasquie@redhat.com>
Date: Mon, 2 Jul 2018 17:23:42 +0200
Subject: [PATCH] travis: remove testing with go 1.x

Travis and CircleCI should use the same Go version(s).

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
---
 .circleci/config.yml | 2 ++
 .travis.yml          | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index cfb7bade03..6e49396af0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,6 +3,8 @@ version: 2
 
 jobs:
   test:
+    # Whenever the Go version is updated here, .travis.yml should also be
+    # updated.
     docker:
     - image: circleci/golang:1.10
     working_directory: /go/src/github.com/prometheus/prometheus
diff --git a/.travis.yml b/.travis.yml
index 82c5f11f2b..7aacb04298 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,9 +2,10 @@ sudo: false
 
 language: go
 
+# Whenever the Go version is updated here, .circleci/config.yml should also be
+# updated.
 go:
 - 1.10.x
-- 1.x
 
 go_import_path: github.com/prometheus/prometheus