From 041545cd6ad53bd8a5279c3ea0ede101865cdc83 Mon Sep 17 00:00:00 2001
From: Phil Estes <estesp@linux.vnet.ibm.com>
Date: Tue, 14 Apr 2020 14:01:29 -0400
Subject: [PATCH] Fix protobuild and CI check protos

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
---
 .github/workflows/ci.yml       |  6 ------
 script/setup/install-dev-tools | 11 ++++++++++-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 242c25d32..853d0e059 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -162,12 +162,6 @@ jobs:
           sudo chmod -R og+r /usr/local/include/google/protobuf/
           protoc --version
 
-      - name: Go get gogo
-        env:
-          GO111MODULE: off
-        # Get proto files, ignore "package github.com/gogo/googleapis: no Go files in ~/go/src/github.com/gogo/googleapis"
-        run: go get -u github.com/gogo/googleapis || true
-
       - name: Install dev tools
         env:
           GO111MODULE: off
diff --git a/script/setup/install-dev-tools b/script/setup/install-dev-tools
index 00589fd87..9aaa23233 100755
--- a/script/setup/install-dev-tools
+++ b/script/setup/install-dev-tools
@@ -20,7 +20,16 @@
 #
 set -eu -o pipefail
 
-go get -u github.com/stevvooe/protobuild
+# install the `protobuild` binary in $GOPATH/bin; requires module-aware install
+# to pin dependencies
+GO111MODULE=on go get github.com/stevvooe/protobuild
+
+# the following packages need to exist in $GOPATH so we can't use
+# go modules-aware mode of `go get` for these includes used during
+# proto building
+GO111MODULE=off go get -d github.com/gogo/googleapis || true
+GO111MODULE=off go get -d github.com/gogo/protobuf || true
+
 go get -u github.com/golangci/golangci-lint/cmd/golangci-lint
 go get -u github.com/cpuguy83/go-md2man