Skip to content

Commit

Permalink
use script to link to staging folder for patches
Browse files Browse the repository at this point in the history
  • Loading branch information
deads2k committed Nov 20, 2017
1 parent 83dd011 commit 73bc168
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 258 deletions.
85 changes: 0 additions & 85 deletions hack/godep-restore.sh

This file was deleted.

173 changes: 0 additions & 173 deletions hack/godep-save.sh

This file was deleted.

44 changes: 44 additions & 0 deletions hack/update-deps.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
#!/bin/bash

source "$(dirname "${BASH_SOURCE}")/lib/init.sh"

# fail early if any of the staging dirs is checked out
for pkg in "$GOPATH/src/k8s.io/kubernetes/staging/src/k8s.io/"*; do
dir=$(basename $pkg)
if [ -d "$GOPATH/src/k8s.io/$dir" ]; then
echo "Conflicting $GOPATH/src/k8s.io/$dir found. Please remove from GOPATH." 1>&2
exit 1
fi
done

# Some things we want in godeps aren't code dependencies, so ./...
# won't pick them up.
# TODO seems like this should be failing something somewhere
#REQUIRED_BINS=(
# "github.com/elazarl/goproxy"
# "github.com/golang/mock/gomock"
# "github.com/containernetworking/cni/plugins/ipam/host-local"
# "github.com/containernetworking/cni/plugins/main/loopback"
# "k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo"
# "k8s.io/code-generator/cmd/client-gen"
# "k8s.io/kubernetes/pkg/api/testing/compat"
# "k8s.io/kubernetes/test/e2e/generated"
# "github.com/onsi/ginkgo/ginkgo"
# "github.com/jteeuwen/go-bindata/go-bindata"
#)

# remove symlinks for glide update
for pkg in vendor/k8s.io/kubernetes/staging/src/k8s.io/*; do
dir=$(basename $pkg)
unlink vendor/k8s.io/$dir || true
rm -rf vendor/k8s.io/$dir || true
done

glide update --strip-vendor

# recreate symlinks after vendoring
for pkg in vendor/k8s.io/kubernetes/staging/src/k8s.io/*; do
dir=$(basename $pkg)
rm -rf vendor/k8s.io/$dir
ln -s kubernetes/staging/src/k8s.io/$dir vendor/k8s.io/$dir
done

0 comments on commit 73bc168

Please sign in to comment.