github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-06 07:57:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #44138 from sttts/sttts-cleanup-godeps-json-updater

Browse Source 
Automatic merge from submit-queue

Clean up staging/godeps-json-updater.go
This commit is contained in:
Kubernetes Submit Queue
2017-04-12 03:02:42 -07:00
committed by GitHub
parent d70b55ead5 6e026b4d43
commit 9db7953c24
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,7 +68,7 @@ function updateGodepManifest() {
GOPATH="${TMP_GOPATH}:${GOPATH}:${KUBE_ROOT}/staging" godep save ${V} ./... 2>&1 | sed 's/^/ /'
echo "Rewriting Godeps.json to remove commits that don't really exist because we haven't pushed the prereqs yet"
go run "${KUBE_ROOT}/staging/godeps-json-updater.go" --godeps-file="${TMP_GOPATH}/src/k8s.io/${repo}/Godeps/Godeps.json" --client-go-import-path="k8s.io/${repo}"
go run "${KUBE_ROOT}/staging/godeps-json-updater.go" --godeps-file="${TMP_GOPATH}/src/k8s.io/${repo}/Godeps/Godeps.json" --override-import-path="k8s.io/${repo}"
# commit so that following repos do not see this repo as dirty
git add vendor >/dev/null