github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Bump godep version to v79

pull/6/head
Christoph Blecker 2017-03-12 14:06:19 -07:00
parent da20ffdae6
commit d31a88fee7
No known key found for this signature in database
GPG Key ID: B34A59A9D39F838B
11 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Godeps/Godeps.json generated
View File

@ -1,7 +1,7 @@
{
"ImportPath": "k8s.io/kubernetes",
"GoVersion": "go1.7",
"GodepVersion": "v74",
"GodepVersion": "v79",
"Packages": [
"github.com/ugorji/go/codec/codecgen",
"github.com/onsi/ginkgo/ginkgo",
@ -16,7 +16,7 @@
{
"ImportPath": "bitbucket.org/ww/goautoneg",
"Comment": "null-5",
"Rev": "'75cd24fc2f2c2a2088577d12123ddee5f54e0675'"
"Rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675"
},
{
"ImportPath": "cloud.google.com/go/compute/metadata",

2
hack/godep-save.sh
View File

@ -22,7 +22,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
source "${KUBE_ROOT}/hack/lib/init.sh"
source "${KUBE_ROOT}/hack/lib/util.sh"
kube::util::ensure_godep_version v74
kube::util::ensure_godep_version v79
# Some things we want in godeps aren't code dependencies, so ./...
# won't pick them up.

5
hack/lib/util.sh
View File

@ -469,7 +469,8 @@ kube::util::ensure_clean_working_dir() {
# Ensure that the given godep version is installed and in the path
kube::util::ensure_godep_version() {
if [[ "$(godep version)" == *"godep ${1}"* ]]; then
GODEP_VERSION=${1:-"v79"}
if [[ "$(godep version)" == *"godep ${GODEP_VERSION}"* ]]; then
return
fi
@ -478,7 +479,7 @@ kube::util::ensure_godep_version() {
GOPATH="${KUBE_TEMP}/go" go get -d -u github.com/tools/godep 2>/dev/null
pushd "${KUBE_TEMP}/go/src/github.com/tools/godep" >/dev/null
git checkout "${1:-v74}"
git checkout "${GODEP_VERSION}"
GOPATH="${KUBE_TEMP}/go" go install .
popd >/dev/null

3
hack/update-all.sh
View File

@ -54,7 +54,7 @@ if ! $ALL ; then
echo "Running in short-circuit mode; run with -a to force all scripts to run."
fi
kube::util::ensure_godep_version v74
kube::util::ensure_godep_version v79
if ! kube::util::godep_restored 2>&1 | sed 's/^/ /'; then
echo "Running godep restore"
@ -95,4 +95,3 @@ for t in $BASH_TARGETS; do
done
echo -e "${color_green}Update scripts completed successfully${color_norm}"

2
hack/update-staging-client-go.sh
View File

@ -22,7 +22,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
source "${KUBE_ROOT}/hack/lib/util.sh"
kube::util::ensure_clean_working_dir
kube::util::ensure_godep_version v74
kube::util::ensure_godep_version v79
cd ${KUBE_ROOT}

2
hack/update-staging-godeps.sh
View File

@ -56,7 +56,7 @@ if ! kube::util::godep_restored 2>&1 | sed 's/^/ /'; then
fi
kube::util::ensure-temp-dir
kube::util::ensure_godep_version v74
kube::util::ensure_godep_version v79
TMP_GOPATH="${KUBE_TEMP}/go"

2
staging/src/k8s.io/apimachinery/Godeps/Godeps.json generated
View File

@ -1,7 +1,7 @@
{
"ImportPath": "k8s.io/apimachinery",
"GoVersion": "go1.7",
"GodepVersion": "v74",
"GodepVersion": "v79",
"Packages": [
"./..."
],

4
staging/src/k8s.io/apiserver/Godeps/Godeps.json generated
View File

@ -1,14 +1,14 @@
{
"ImportPath": "k8s.io/apiserver",
"GoVersion": "go1.7",
"GodepVersion": "v74",
"GodepVersion": "v79",
"Packages": [
"./..."
],
"Deps": [
{
"ImportPath": "bitbucket.org/ww/goautoneg",
"Rev": "'75cd24fc2f2c2a2088577d12123ddee5f54e0675'"
"Rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675"
},
{
"ImportPath": "github.com/PuerkitoBio/purell",

2
staging/src/k8s.io/client-go/Godeps/Godeps.json generated
View File

@ -1,7 +1,7 @@
{
"ImportPath": "k8s.io/client-go",
"GoVersion": "go1.7",
"GodepVersion": "v74",
"GodepVersion": "v79",
"Packages": [
"./..."
],

4
staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json generated
View File

@ -1,14 +1,14 @@
{
"ImportPath": "k8s.io/kube-aggregator",
"GoVersion": "go1.7",
"GodepVersion": "v74",
"GodepVersion": "v79",
"Packages": [
"./..."
],
"Deps": [
{
"ImportPath": "bitbucket.org/ww/goautoneg",
"Rev": "'75cd24fc2f2c2a2088577d12123ddee5f54e0675'"
"Rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675"
},
{
"ImportPath": "github.com/PuerkitoBio/purell",

4
staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json generated
View File

@ -1,14 +1,14 @@
{
"ImportPath": "k8s.io/sample-apiserver",
"GoVersion": "go1.7",
"GodepVersion": "v74",
"GodepVersion": "v79",
"Packages": [
"./..."
],
"Deps": [
{
"ImportPath": "bitbucket.org/ww/goautoneg",
"Rev": "'75cd24fc2f2c2a2088577d12123ddee5f54e0675'"
"Rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675"
},
{
"ImportPath": "github.com/PuerkitoBio/purell",