Merge pull request #521 from wking/makefile-travis-ifdef

Makefile: Use 'ifdef TRAVIS_COMMIT_RANGE' for git-validation
opencontainers · Jan 24, 2017 · 2d7ee1a · 2d7ee1a
2 parents c91a349 + 8236f61
commit 2d7ee1a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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

diff --git 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