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

Merge pull request #22892 from ixdy/verify-all 

Auto commit by PR queue bot
pull/6/head
k8s-merge-robot 2016-03-12 04:33:17 -08:00
parent ec0c0d7219 51f70b6154
commit 747040582b
4 changed files with 820 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

914
Godeps/LICENSES generated
View File

File diff suppressed because it is too large Load Diff

1
Makefile
View File

@ -56,7 +56,6 @@ all:
# make verify BRANCH=branch_x # make verify BRANCH=branch_x
verify: verify:
KUBE_VERIFY_GIT_BRANCH=$(BRANCH) hack/verify-all.sh -v KUBE_VERIFY_GIT_BRANCH=$(BRANCH) hack/verify-all.sh -v
hack/verify-godep-licenses.sh $(BRANCH) # Remove this after fixing issue #22843
.PHONY: verify .PHONY: verify
# Build and run tests. # Build and run tests.

2
hack/update-godep-licenses.sh
View File

@ -116,7 +116,7 @@ process_content () {
-maxdepth ${find_maxdepth} -type f "${find_names[@]}")) -maxdepth ${find_maxdepth} -type f "${find_names[@]}"))
done done
# Uniquely sort the array # Uniquely sort the array
IFS=$'\n' local_files=($(sort -u <<<"${local_files[*]-}")) IFS=$'\n' local_files=($(LC_ALL=C sort -u <<<"${local_files[*]-}"))
unset IFS unset IFS
for f in ${local_files[@]-}; do for f in ${local_files[@]-}; do

1
hack/verify-all.sh
View File

@ -27,7 +27,6 @@ SILENT=true
EXCLUDED_CHECKS=( EXCLUDED_CHECKS=(
"verify-linkcheck.sh" # runs in separate Jenkins job once per day due to high network usage "verify-linkcheck.sh" # runs in separate Jenkins job once per day due to high network usage
"verify-generated-protobuf.sh" # TODO(smarterclayton) add when protobuf is part of direct generation "verify-generated-protobuf.sh" # TODO(smarterclayton) add when protobuf is part of direct generation
"verify-godep-licenses.sh" # Broken on Jenkins, issue #22843
) )
function is-excluded { function is-excluded {