From fcf134af0c11eddd299333f593ee69860fa08931 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Mon, 23 Jan 2017 15:44:49 -0800 Subject: [PATCH 1/2] Makefile: Use 'ifdef TRAVIS_COMMIT_RANGE' for git-validation Only use the auto-ranging when Travis tells us what the range is. Use our EPOCH_TEST_COMMIT-based range in all other cases. ifdef is described in [1]. [1]: https://www.gnu.org/software/make/manual/html_node/Conditional-Syntax.html Signed-off-by: W. Trevor King --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e4480971b..136db420f 100644 --- a/Makefile +++ b/Makefile @@ -109,7 +109,7 @@ img/%.png: img/%.dot # When this is running in travis, it will only check the travis commit range .gitvalidation: @which git-validation > /dev/null 2>/dev/null || (echo "ERROR: git-validation not found. Consider 'make install.tools' target" && false) -ifeq ($(TRAVIS),true) +ifdef TRAVIS_COMMIT_RANGE git-validation -q -run DCO,short-subject,dangling-whitespace else git-validation -v -run DCO,short-subject,dangling-whitespace -range $(EPOCH_TEST_COMMIT)..HEAD From 8236f61163ff051c0765f8d3a0e5682f6bf497b0 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Mon, 23 Jan 2017 15:46:48 -0800 Subject: [PATCH 2/2] .travis.yml: Print TRAVIS_* environment variables To make make debugging Travis environment issues more straightforward. Signed-off-by: W. Trevor King --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 5894160b9..17f4840ce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,7 @@ before_install: install: true script: + - env | grep TRAVIS_ - make .gitvalidation - make lint - make check-license