github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-20 01:23:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #20770 from liggitt/ugorji-var-reset

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-13 14:59:38 -08:00
parent a2ce07e554 dd5d98d80a
commit f43b849e54
28 changed files with 58780 additions and 57539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hack/verify-codecgen.sh
View File

@@ -95,6 +95,8 @@ for current in ${index[@]}; do
pushd "$(dirname ${file})" > /dev/null
base_file=$(basename "${file}")
base_generated_file=$(basename "${generated_file}")
# temporarily move the generated file to a non-go file so it doesn't influence the verify codecgen
mv "${base_generated_file}" "${base_generated_file}.bak"
# We use '-d 1234' flag to have a deterministic output everytime.
# The constant was just randomly chosen.
${CODECGEN} -d 1234 -o "${base_generated_file}.1tmp" "${base_file}"
@@ -102,6 +104,8 @@ for current in ${index[@]}; do
sed 's/YEAR/2015/' "${initial_dir}/hack/boilerplate/boilerplate.go.txt" > "${base_generated_file}.tmp"
cat "${base_generated_file}.1tmp" >> "${base_generated_file}.tmp"
rm "${base_generated_file}.1tmp"
# restore the generated file
mv "${base_generated_file}.bak" "${base_generated_file}"
ret=0
diff -Naupr -I 'Auto generated by' "${base_generated_file}" "${base_generated_file}.tmp" || ret=$?
if [[ $ret -eq 0 ]]; then