Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
a34b1cfc
Unverified
Commit
a34b1cfc
authored
Feb 07, 2018
by
Christoph Blecker
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Route verify-godeps output to stderr
parent
4ae195cb
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
14 deletions
+14
-14
verify-godeps.sh
hack/verify-godeps.sh
+14
-14
No files found.
hack/verify-godeps.sh
View file @
a34b1cfc
...
...
@@ -85,14 +85,14 @@ ret=0
pushd
"
${
KUBE_ROOT
}
"
2>&1
>
/dev/null
# Test for diffs
if
!
_out
=
"
$(
diff
-Naupr
--ignore-matching-lines
=
'^\s*\"GoVersion\":'
--ignore-matching-line
=
'^\s*\"GodepVersion\":'
--ignore-matching-lines
=
'^\s*\"Comment\":'
Godeps/Godeps.json
${
_kubetmp
}
/Godeps/Godeps.json
)
"
;
then
echo
"Your Godeps.json is different:"
echo
"
${
_out
}
"
echo
"Godeps Verify failed."
echo
"Your Godeps.json is different:"
>
&2
echo
"
${
_out
}
"
>
&2
echo
"Godeps Verify failed."
>
&2
echo
"
${
_out
}
"
>
godepdiff.patch
echo
"If you're seeing this locally, run the below command to fix your Godeps.json:"
echo
"patch -p0 < godepdiff.patch"
echo
"(The above output can be saved as godepdiff.patch if you're not running this locally)"
echo
"(The patch file should also be exported as a build artifact if run through CI)"
echo
"If you're seeing this locally, run the below command to fix your Godeps.json:"
>
&2
echo
"patch -p0 < godepdiff.patch"
>
&2
echo
"(The above output can be saved as godepdiff.patch if you're not running this locally)"
>
&2
echo
"(The patch file should also be exported as a build artifact if run through CI)"
>
&2
KEEP_TMP
=
true
if
[[
-f
godepdiff.patch
&&
-d
"
${
ARTIFACTS_DIR
:-}
"
]]
;
then
echo
"Copying patch to artifacts.."
...
...
@@ -102,14 +102,14 @@ pushd "${KUBE_ROOT}" 2>&1 > /dev/null
fi
if
!
_out
=
"
$(
diff
-Naupr
-x
"BUILD"
-x
"OWNERS"
-x
"AUTHORS*"
-x
"CONTRIBUTORS*"
vendor
${
_kubetmp
}
/vendor
)
"
;
then
echo
"Your vendored results are different:"
echo
"
${
_out
}
"
echo
"Godeps Verify failed."
echo
"Your vendored results are different:"
>
&2
echo
"
${
_out
}
"
>
&2
echo
"Godeps Verify failed."
>
&2
echo
"
${
_out
}
"
>
vendordiff.patch
echo
"If you're seeing this locally, run the below command to fix your directories:"
echo
"patch -p0 < vendordiff.patch"
echo
"(The above output can be saved as godepdiff.patch if you're not running this locally)"
echo
"(The patch file should also be exported as a build artifact if run through CI)"
echo
"If you're seeing this locally, run the below command to fix your directories:"
>
&2
echo
"patch -p0 < vendordiff.patch"
>
&2
echo
"(The above output can be saved as godepdiff.patch if you're not running this locally)"
>
&2
echo
"(The patch file should also be exported as a build artifact if run through CI)"
>
&2
KEEP_TMP
=
true
if
[[
-f
vendordiff.patch
&&
-d
"
${
ARTIFACTS_DIR
:-}
"
]]
;
then
echo
"Copying patch to artifacts.."
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment