From 34e35b716828be26bf7c7204f063e4a8045d4f32 Mon Sep 17 00:00:00 2001
From: Travis Groth <travisgroth@users.noreply.github.com>
Date: Wed, 22 Jan 2020 00:09:14 -0500
Subject: [PATCH] Fix travis matrix conflict (#466)

---
 .travis.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 75631937f..e83ba7f56 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -59,11 +59,12 @@ docker_setup: &docker_setup
 docker_login: &docker_login
   - echo ${DOCKER_PASSWORD} | docker login -u ${DOCKER_USERNAME} --password-stdin
 
-jobs:
+matrix:
   include:
     - name: "Test Build amd64"
       stage: "Docker Test Build"
       install: *docker_setup
+      go: 1.x
       script:
         - .travis/docker_build.sh ${TRAVIS_REPO_SLUG}:${TRAVIS_COMMIT} Dockerfile
 
@@ -72,6 +73,7 @@ jobs:
       if: branch = master
       install: *docker_setup
       before_script: *docker_login
+      go: 1.x
       script:
         - .travis/docker_build.sh ${TRAVIS_REPO_SLUG}:master Dockerfile
         - docker push ${TRAVIS_REPO_SLUG}
@@ -80,6 +82,7 @@ jobs:
       if: branch = master
       install: *docker_setup
       before_script: *docker_login
+      go: 1.x
       script:
         - .travis/docker_build.sh ${TRAVIS_REPO_SLUG}:arm64v8-master Dockerfile.arm64v8
         - docker push ${TRAVIS_REPO_SLUG}
@@ -88,6 +91,7 @@ jobs:
       if: tag =~ /^v([0-9.]+)$/
       install: *docker_setup
       before_script: *docker_login
+      go: 1.x
       script:
         - .travis/docker_build.sh ${TRAVIS_REPO_SLUG}:${TRAVIS_TAG} Dockerfile
         - docker tag ${TRAVIS_REPO_SLUG}:${TRAVIS_TAG} ${TRAVIS_REPO_SLUG}:latest
@@ -99,6 +103,7 @@ jobs:
       if: tag =~ /^v([0-9.]+)$/
       install: *docker_setup
       before_script: *docker_login
+      go: 1.x
       script:
         - .travis/docker_build.sh ${TRAVIS_REPO_SLUG}:arm64v8-${TRAVIS_TAG} Dockerfile.arm64v8
         - docker tag ${TRAVIS_REPO_SLUG}:arm64v8-${TRAVIS_TAG} ${TRAVIS_REPO_SLUG}:arm64v8-latest
@@ -108,6 +113,7 @@ jobs:
       if: tag =~ /^v([0-9.]+)$/
       install: *docker_setup
       before_script: *docker_login
+      go: 1.x
       script:
         - .travis/docker_build.sh ${TRAVIS_REPO_SLUG}:arm32v7-${TRAVIS_TAG} Dockerfile.arm32v7
         - docker tag ${TRAVIS_REPO_SLUG}:arm32v7-${TRAVIS_TAG} ${TRAVIS_REPO_SLUG}:arm32v7-latest
@@ -117,6 +123,7 @@ jobs:
       if: tag =~ /^v([0-9.]+)$/
       install: *docker_setup
       before_script: *docker_login
+      go: 1.x
       script:
         - .travis/docker_build.sh ${TRAVIS_REPO_SLUG}:arm32v6-${TRAVIS_TAG} Dockerfile.arm32v6
         - docker tag ${TRAVIS_REPO_SLUG}:arm32v6-${TRAVIS_TAG} ${TRAVIS_REPO_SLUG}:arm32v6-latest