From 64026d252cd9f03b701ed5e74f8e93a0b636b9ba Mon Sep 17 00:00:00 2001
From: Michael McLoughlin <mmcloughlin@gmail.com>
Date: Sun, 6 Jan 2019 20:35:58 -0800
Subject: [PATCH] ci: do not use go modules

Attempt to fix a stream of CI failures that started on the addition of
Go modules.

I wonder if we are falling foul of this warning in the wiki
https://github.com/golang/go/wiki/Modules.

"The module cache in Go 1.11 can sometimes cause various errors,
primarily if there were previously network issues or multiple go
commands executing in parallel (see #26794, which is addressed for Go
1.12). As a troubleshooting step, you can copy $GOPATH/pkg/mod to a
backup directory (in case further investigation is warranted later), run
go clean -modcache, and then see whether the original problem persists."

Updates #21
---
 .travis.yml      | 2 --
 script/bootstrap | 6 ++++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6c4fd55..39ddb5d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,6 @@
 language: go
 go:
 - 1.11.1
-env:
-- GO111MODULE=on
 install:
 - ./script/bootstrap
 script:
diff --git a/script/bootstrap b/script/bootstrap
index dd48814..78b4a25 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -1,7 +1,9 @@
 #!/bin/bash -ex
 
-# Install go module dependencies.
-go mod download
+# Limit dependencies to golang.org/x repos
+go get -u \
+    golang.org/x/arch/x86/... \
+    golang.org/x/tools/go/...
 
 # Install golangci-lint
 golangci_lint_version='v1.12.3'