github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 05:03:09 +00:00
Code Issues Projects Releases Wiki Activity

add staging/ to gopath

Browse Source 
remove recursive staging folder
This commit is contained in:
Chao Xu 2017-02-07 05:02:21 -08:00
parent 844407e6ca
commit 0d6bcf860c
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
staging/copy.sh
View File

@ -109,6 +109,12 @@ mkcp "pkg/client/clientset_generated/${CLIENTSET}" "pkg/client/clientset_generat
pushd "${CLIENT_REPO_TEMP}" > /dev/null pushd "${CLIENT_REPO_TEMP}" > /dev/null
echo "generating vendor/" echo "generating vendor/"
# client-go depends on some apimachinery packages. Adding staging/ to the GOPATH
# so that if client-go has new dependencies on apimachinery, `godep save` can
# find the dependent packages in staging/, instead of failing. Note that all
# k8s.io/apimachinery dependencies will be updated later by the robot to point
# to the real k8s.io/apimachinery commit and vendor the real code.
GOPATH="${GOPATH}:${MAIN_REPO}/staging"
GO15VENDOREXPERIMENT=1 godep save ./... GO15VENDOREXPERIMENT=1 godep save ./...
popd > /dev/null popd > /dev/null
@ -186,6 +192,13 @@ find "${CLIENT_REPO_TEMP}" -type f \( \
echo "remove cyclical godep" echo "remove cyclical godep"
rm -rf "${CLIENT_REPO_TEMP}/_vendor/k8s.io/client-go" rm -rf "${CLIENT_REPO_TEMP}/_vendor/k8s.io/client-go"
# If godep cannot find dependent packages in the primary GOPATH, it will search
# in the secondary GOPATH staging/. If successful, godep will wrongly copy the
# dependents relative to the primary GOPATH (looks like a godep bug), creating
# the ${CLIENT_REPO_TEMP}/staging dir. These copies will not be recognized by
# the Go compiler, so we just remove them. Note that the publishing robot will
# correctly resolve these dependencies later.
rm -rf "${CLIENT_REPO_TEMP}/staging"
if [ "${FAIL_ON_CHANGES}" = true ]; then if [ "${FAIL_ON_CHANGES}" = true ]; then
echo "running FAIL_ON_CHANGES" echo "running FAIL_ON_CHANGES"