CI: have "static-analysis" run "check-builtins", not "documentation"

avar · gitster · commit 3e05ff3e1470 · 2022-03-27T22:18:10.000-07:00
Move the "make check-builtins" check from the "documentation" job to the "static-analysis" job. The "check-builtins" target added in c74390e (cherry is built-in, do not ship git-cherry.sh, 2006-11-05) is unrelated to the documentation, so it's odd that b98712b (travis-ci: build documentation, 2016-05-04) added it to the "documentation" job. Let's just move it to the "ci-static-analysis" target, and while we're at it improve the output with $(QUIET_CHECK). Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/Makefile b/Makefile
@@ -3384,7 +3384,7 @@ check-docs::
 ### Make sure built-ins do not have dups and listed in git.c
 #
 check-builtins::
-	./check-builtins.sh
+	$(QUIET_CHECK)./check-builtins.sh
 
 ### Test suite coverage testing
 #
@@ -3474,5 +3474,6 @@ ci-check-directional-formatting:
 
 .PHONY: ci-static-analysis
 ci-static-analysis: ci-check-directional-formatting
+ci-static-analysis: check-builtins
 ci-static-analysis: check-coccicheck
 ci-static-analysis: hdr-check
diff --git a/ci/test-documentation.sh b/ci/test-documentation.sh
@@ -14,7 +14,6 @@ filter_log () {
 	    "$1"
 }
 
-make check-builtins
 make check-docs
 
 # Build docs with AsciiDoc

Original file line number	Diff line number	Diff line change
`@@ -3384,7 +3384,7 @@ check-docs::`
`3384`	`3384`	`### Make sure built-ins do not have dups and listed in git.c`
`3385`	`3385`	`#`
`3386`	`3386`	`check-builtins::`
`3387`		`- ./check-builtins.sh`
	`3387`	`+ $(QUIET_CHECK)./check-builtins.sh`
`3388`	`3388`
`3389`	`3389`	`### Test suite coverage testing`
`3390`	`3390`	`#`
`@@ -3474,5 +3474,6 @@ ci-check-directional-formatting:`
`3474`	`3474`
`3475`	`3475`	`.PHONY: ci-static-analysis`
`3476`	`3476`	`ci-static-analysis: ci-check-directional-formatting`
	`3477`	`+ci-static-analysis: check-builtins`
`3477`	`3478`	`ci-static-analysis: check-coccicheck`
`3478`	`3479`	`ci-static-analysis: hdr-check`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@ filter_log () {`
`14`	`14`	`"$1"`
`15`	`15`	`}`
`16`	`16`
`17`		`-make check-builtins`
`18`	`17`	`make check-docs`
`19`	`18`
`20`	`19`	`# Build docs with AsciiDoc`