Skip to content

Commit 73bc168

Browse files
committed
use script to link to staging folder for patches
1 parent 83dd011 commit 73bc168

File tree

3 files changed

+44
-258
lines changed

3 files changed

+44
-258
lines changed

hack/godep-restore.sh

Lines changed: 0 additions & 85 deletions
This file was deleted.

hack/godep-save.sh

Lines changed: 0 additions & 173 deletions
This file was deleted.

hack/update-deps.sh

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
#!/bin/bash
2+
3+
source "$(dirname "${BASH_SOURCE}")/lib/init.sh"
4+
5+
# fail early if any of the staging dirs is checked out
6+
for pkg in "$GOPATH/src/k8s.io/kubernetes/staging/src/k8s.io/"*; do
7+
dir=$(basename $pkg)
8+
if [ -d "$GOPATH/src/k8s.io/$dir" ]; then
9+
echo "Conflicting $GOPATH/src/k8s.io/$dir found. Please remove from GOPATH." 1>&2
10+
exit 1
11+
fi
12+
done
13+
14+
# Some things we want in godeps aren't code dependencies, so ./...
15+
# won't pick them up.
16+
# TODO seems like this should be failing something somewhere
17+
#REQUIRED_BINS=(
18+
# "github.com/elazarl/goproxy"
19+
# "github.com/golang/mock/gomock"
20+
# "github.com/containernetworking/cni/plugins/ipam/host-local"
21+
# "github.com/containernetworking/cni/plugins/main/loopback"
22+
# "k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo"
23+
# "k8s.io/code-generator/cmd/client-gen"
24+
# "k8s.io/kubernetes/pkg/api/testing/compat"
25+
# "k8s.io/kubernetes/test/e2e/generated"
26+
# "github.com/onsi/ginkgo/ginkgo"
27+
# "github.com/jteeuwen/go-bindata/go-bindata"
28+
#)
29+
30+
# remove symlinks for glide update
31+
for pkg in vendor/k8s.io/kubernetes/staging/src/k8s.io/*; do
32+
dir=$(basename $pkg)
33+
unlink vendor/k8s.io/$dir || true
34+
rm -rf vendor/k8s.io/$dir || true
35+
done
36+
37+
glide update --strip-vendor
38+
39+
# recreate symlinks after vendoring
40+
for pkg in vendor/k8s.io/kubernetes/staging/src/k8s.io/*; do
41+
dir=$(basename $pkg)
42+
rm -rf vendor/k8s.io/$dir
43+
ln -s kubernetes/staging/src/k8s.io/$dir vendor/k8s.io/$dir
44+
done

0 commit comments

Comments
 (0)