From ec18d4ead15bee71af05db1db9b7167fa710eea4 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Tue, 3 Apr 2018 13:43:53 +0100 Subject: [PATCH] generate-files: auto sync gogo version to vendor.conf Signed-off-by: Ian Campbell --- hack/update-generated-files | 3 ++- hack/validate-generated-files | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hack/update-generated-files b/hack/update-generated-files index 03e29c413..1611ca49e 100755 --- a/hack/update-generated-files +++ b/hack/update-generated-files @@ -2,8 +2,9 @@ set -eu -o pipefail -x +gogo_version=$(awk '$1 == "github.com/gogo/protobuf" { print $2 }' vendor.conf) iidfile=$(mktemp -t docker-iidfile.XXXXXXXXXX) -docker build --build-arg GOGO_VERSION=v0.5 --iidfile $iidfile -f ./hack/dockerfiles/generated-files.Dockerfile --target update --force-rm . +docker build --build-arg GOGO_VERSION=$gogo_version --iidfile $iidfile -f ./hack/dockerfiles/generated-files.Dockerfile --target update --force-rm . iid=$(cat $iidfile) cid=$(docker create $iid noop) diff --git a/hack/validate-generated-files b/hack/validate-generated-files index 789fb0d48..323e07674 100755 --- a/hack/validate-generated-files +++ b/hack/validate-generated-files @@ -4,7 +4,8 @@ set -eu -o pipefail case ${1:-} in '') - docker build --build-arg GOGO_VERSION=v0.5 -f ./hack/dockerfiles/generated-files.Dockerfile --target validate --force-rm . + gogo_version=$(awk '$1 == "github.com/gogo/protobuf" { print $2 }' vendor.conf) + docker build --build-arg GOGO_VERSION=$gogo_version -f ./hack/dockerfiles/generated-files.Dockerfile --target validate --force-rm . ;; check) diffs="$(git status --porcelain -- **/*.pb.go 2>/dev/null)"