12024: Use vendor bundle when building Go packages.

refs #12024

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curoverse.com>

diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh
index 39c40934311c9786ba0ed7786818807d77086ab6..a0a6c5f2645f6a17ca201f51672e160f29d37e86 100755 (executable)
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -340,6 +340,7 @@ fi
 # Go binaries
 cd $WORKSPACE/packages/$TARGET
 export GOPATH=$(mktemp -d)
+go get -v github.com/kardianos/govendor
 package_go_binary sdk/go/crunchrunner crunchrunner \
     "Crunchrunner executes a command inside a container and uploads the output"
 package_go_binary services/arv-git-httpd arvados-git-httpd \

diff --git a/build/run-library.sh b/build/run-library.sh
index cbb5ee8efc28e975eb34389d88145cb0886db8ca..cf7755b68de780631cee4319ea720160146ffdff 100755 (executable)
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -103,6 +103,7 @@ package_go_binary() {
 
     mkdir -p "$GOPATH/src/git.curoverse.com"
     ln -sfn "$WORKSPACE" "$GOPATH/src/git.curoverse.com/arvados.git"
+    (cd "$GOPATH/src/git.curoverse.com/arvados.git" && "$GOPATH/bin/govendor" sync -v)
 
     cd "$GOPATH/src/git.curoverse.com/arvados.git/$src_path"
     local version="$(version_from_git)"