From a61655f945c0b472b601f80a071e5672288340c9 Mon Sep 17 00:00:00 2001 From: Joe Lanford Date: Wed, 19 Jun 2019 11:42:36 -0400 Subject: [PATCH 1/2] hack/ci/setup-build-dependencies.sh: add setup script in SDK repo --- hack/ci/setup-build-dependencies.sh | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100755 hack/ci/setup-build-dependencies.sh diff --git a/hack/ci/setup-build-dependencies.sh b/hack/ci/setup-build-dependencies.sh new file mode 100755 index 00000000000..07854a1d5de --- /dev/null +++ b/hack/ci/setup-build-dependencies.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +set -e + +# Install dep +curl -Lo dep https://github.com/golang/dep/releases/download/v0.5.0/dep-linux-amd64 && chmod +x dep && mv dep /usr/local/bin/ + +# Ensure vendor directory is up-to-date +make dep From b0b27df51111ab0c3e7ca2ec67c76a23c6993631 Mon Sep 17 00:00:00 2001 From: Joe Lanford Date: Wed, 19 Jun 2019 12:11:15 -0400 Subject: [PATCH 2/2] .travis.yml,hack: bumping dep to v0.5.3 --- .travis.yml | 4 ++-- hack/ci/setup-build-dependencies.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index c8429e96f39..e56b134b321 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ x_base_steps: # before_install for jobs that require dep - &dep_before_install before_install: - - curl -Lo dep https://github.com/golang/dep/releases/download/v0.5.0/dep-linux-amd64 && chmod +x dep && sudo mv dep /usr/local/bin/ + - curl -Lo dep https://github.com/golang/dep/releases/download/v0.5.3/dep-linux-amd64 && chmod +x dep && sudo mv dep /usr/local/bin/ - travis_retry dep ensure -v # before_install for jobs that require go builds and do not run for doc-only changes - &go_before_install @@ -25,7 +25,7 @@ x_base_steps: # hack/ci/check-doc-only-update.sh needs to be sourced so # that it can properly exit the test early with success - source hack/ci/check-doc-only-update.sh - - curl -Lo dep https://github.com/golang/dep/releases/download/v0.5.0/dep-linux-amd64 && chmod +x dep && sudo mv dep /usr/local/bin/ + - curl -Lo dep https://github.com/golang/dep/releases/download/v0.5.3/dep-linux-amd64 && chmod +x dep && sudo mv dep /usr/local/bin/ - travis_retry dep ensure -v # Base go, ansbile, and helm job diff --git a/hack/ci/setup-build-dependencies.sh b/hack/ci/setup-build-dependencies.sh index 07854a1d5de..98abacec81d 100755 --- a/hack/ci/setup-build-dependencies.sh +++ b/hack/ci/setup-build-dependencies.sh @@ -3,7 +3,7 @@ set -e # Install dep -curl -Lo dep https://github.com/golang/dep/releases/download/v0.5.0/dep-linux-amd64 && chmod +x dep && mv dep /usr/local/bin/ +curl -Lo dep https://github.com/golang/dep/releases/download/v0.5.3/dep-linux-amd64 && chmod +x dep && mv dep /usr/local/bin/ # Ensure vendor directory is up-to-date make dep