workaround for goautoneg dependency issue with go mod

estroz · estroz · commit bead9782418e · 2019-03-19T20:30:01.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,7 @@ cache:
     - $HOME/.cache/go-build
 
 go:
-- 1.11.2
+- 1.11.x
 
 env:
   global:
diff --git a/Makefile b/Makefile
@@ -31,14 +31,16 @@ format:
 	$(Q)go fmt $(PKGS)
 
 dep:
+	$(Q)touch ./vendor/github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg/go.mod # Workaround for https://github.com/golang/go/issues/30934
 ifeq ($(BUILD_VERBOSE),1)
 	GO111MODULE=on go mod vendor -v
 else
 	$(Q)GO111MODULE=on go mod vendor
 endif
 
 dep-update:
-	$(Q)go get -u -v
+	$(Q)touch ./vendor/github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg/go.mod # Workaround for https://github.com/golang/go/issues/30934
+	$(Q)GO111MODULE=on go get -u -v
 
 clean:
 	$(Q)rm -rf build
diff --git a/go.mod b/go.mod
@@ -97,3 +97,6 @@ replace (
 	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20190202012332-e37a94925e5c
 	k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20180711000925-0cf8f7e6ed1d
 )
+
+// Workaround for https://github.com/golang/go/issues/30934
+replace bitbucket.org/ww/goautoneg => ./vendor/github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg
diff --git a/go.sum b/go.sum

-Original file line number
+Diff line change
     - $HOME/.cache/go-build
 go:
 -- 1.11.2
 +- 1.11.x
 env:
   global:
Original file line number	Diff line number	Diff line change
`@@ -97,3 +97,6 @@ replace (`
`97`	`97`	`k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20190202012332-e37a94925e5c`
`98`	`98`	`k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20180711000925-0cf8f7e6ed1d`
`99`	`99`	`)`
	`100`	`+`
	`101`	`+// Workaround for https://github.com/golang/go/issues/30934`
	`102`	`+replace bitbucket.org/ww/goautoneg => ./vendor/github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg`