From 5543e2e3fd8a314295ae6ef0aabb5c9a3cc20925 Mon Sep 17 00:00:00 2001 From: Eric Paris Date: Thu, 10 Mar 2016 13:45:36 -0500 Subject: [PATCH] Create a script to update godeps Since its hard for an individual to remember that we need codecgen and ginkgo in godeps but don't actually have that dependancy listed in a way that godep can automatically find. --- hack/godep-save.sh | 34 ++++++++++++++++++++++++++++++++++ hack/verify-godeps.sh | 3 +-- 2 files changed, 35 insertions(+), 2 deletions(-) create mode 100755 hack/godep-save.sh diff --git a/hack/godep-save.sh b/hack/godep-save.sh new file mode 100755 index 00000000000..960cd9d7a45 --- /dev/null +++ b/hack/godep-save.sh @@ -0,0 +1,34 @@ +#!/bin/bash + +# Copyright 2016 The Kubernetes Authors All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -o errexit +set -o nounset +set -o pipefail + +KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. +GODEP="${GODEP:-godep}" + +# Some things we want in godeps aren't code dependencies, so ./... +# won't pick them up. +REQUIRED_BINS=( + "github.com/ugorji/go/codec/codecgen" + "github.com/onsi/ginkgo/ginkgo" + "./..." +) + +pushd "${KUBE_ROOT}" > /dev/null + GO15VENDOREXPERIMENT=1 ${GODEP} save "${REQUIRED_BINS[@]}" +popd > /dev/null diff --git a/hack/verify-godeps.sh b/hack/verify-godeps.sh index 9d4fc938acd..c7da8cc5682 100755 --- a/hack/verify-godeps.sh +++ b/hack/verify-godeps.sh @@ -88,8 +88,7 @@ rm -rf ./Godeps ./vendor git init > /dev/null 2>&1 # Recreate the Godeps using the nice clean set we just downloaded -# TODO(thockin, eparis): Move this in to a common script with hack/godep-save.sh -"${GODEP}" save github.com/ugorji/go/codec/codecgen github.com/onsi/ginkgo/ginkgo ./... +hack/godep-save.sh # Test for diffs if ! _out="$(diff -Naupr --ignore-matching-lines='^\s*\"GoVersion\":' --ignore-matching-lines='^\s*\"Comment\":' ${KUBE_ROOT}/Godeps/Godeps.json ${_kubetmp}/Godeps/Godeps.json)"; then