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
d295ca11
Commit
d295ca11
authored
Feb 28, 2018
by
Ryan Hitchman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add support for `make verify WHAT=typecheck`.
This will be used to make the typecheck job emit junit and avoids duplicating the rest of the verify logic.
parent
f6e23e32
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
7 deletions
+26
-7
Makefile
build/root/Makefile
+2
-0
verify.sh
hack/make-rules/verify.sh
+24
-7
No files found.
build/root/Makefile
View file @
d295ca11
...
@@ -112,10 +112,12 @@ define VERIFY_HELP_INFO
...
@@ -112,10 +112,12 @@ define VERIFY_HELP_INFO
#
#
# Args:
# Args:
# BRANCH: Branch to be passed to verify-godeps.sh script.
# BRANCH: Branch to be passed to verify-godeps.sh script.
# WHAT: List of checks to run
#
#
# Example:
# Example:
# make verify
# make verify
# make verify BRANCH=branch_x
# make verify BRANCH=branch_x
# make verify WHAT="bazel typecheck"
endef
endef
.PHONY
:
verify
.PHONY
:
verify
ifeq
($(PRINT_HELP),y)
ifeq
($(PRINT_HELP),y)
...
...
hack/make-rules/verify.sh
View file @
d295ca11
...
@@ -73,6 +73,17 @@ function is-quick {
...
@@ -73,6 +73,17 @@ function is-quick {
return
1
return
1
}
}
function
is-explicitly-chosen
{
local
name
=
"
${
1
#verify-
}
"
name
=
"
${
name
%.*
}
"
for
e
in
${
WHAT
}
;
do
if
[[
$e
==
"
$name
"
]]
;
then
return
fi
done
return
1
}
function
run-cmd
{
function
run-cmd
{
local
filename
=
"
${
2
##*/verify-
}
"
local
filename
=
"
${
2
##*/verify-
}
"
local
testname
=
"
${
filename
%%.*
}
"
local
testname
=
"
${
filename
%%.*
}
"
...
@@ -109,13 +120,19 @@ function run-checks {
...
@@ -109,13 +120,19 @@ function run-checks {
for
t
in
$(
ls
${
pattern
})
for
t
in
$(
ls
${
pattern
})
do
do
local
check_name
=
"
$(
basename
"
${
t
}
"
)
"
local
check_name
=
"
$(
basename
"
${
t
}
"
)
"
if
is-excluded
"
${
t
}
"
;
then
if
[[
!
-z
${
WHAT
:-}
]]
;
then
echo
"Skipping
${
check_name
}
"
if
!
is-explicitly-chosen
"
${
check_name
}
"
;
then
continue
continue
fi
fi
if
${
QUICK
}
&&
!
is-quick
"
${
t
}
"
;
then
else
echo
"Skipping
${
check_name
}
in quick mode"
if
is-excluded
"
${
t
}
"
;
then
continue
echo
"Skipping
${
check_name
}
"
continue
fi
if
${
QUICK
}
&&
!
is-quick
"
${
t
}
"
;
then
echo
"Skipping
${
check_name
}
in quick mode"
continue
fi
fi
fi
echo
-e
"Verifying
${
check_name
}
"
echo
-e
"Verifying
${
check_name
}
"
local
start
=
$(
date
+%s
)
local
start
=
$(
date
+%s
)
...
...
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