Skip to content

Commit 3297cd5

Browse files
author
Michael Crosby
authored
Merge pull request opencontainers#216 from wking/travis-test-branch-commits
.travis: Convert TRAVIS_COMMIT_RANGE base...head to base..head
2 parents 8df6024 + 550a73a commit 3297cd5

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

.travis.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ before_install:
1616
install: true
1717

1818
script:
19+
- env | grep TRAVIS_
1920
- make .govet
2021
- make .golint
21-
- make .gitvalidation
22+
- echo "${TRAVIS_COMMIT_RANGE} -> ${TRAVIS_COMMIT_RANGE/.../..} (travis-ci/travis-ci#4596)"
23+
- TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE/.../..}" make .gitvalidation
2224
- make docs

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ endif
7474
# When this is running in travis, it will only check the travis commit range
7575
.gitvalidation:
7676
@which git-validation > /dev/null 2>/dev/null || (echo "ERROR: git-validation not found. Consider 'make install.tools' target" && false)
77-
ifeq ($(TRAVIS),true)
77+
ifdef TRAVIS_COMMIT_RANGE
7878
git-validation -q -run DCO,short-subject,dangling-whitespace
7979
else
8080
git-validation -v -run DCO,short-subject,dangling-whitespace -range $(EPOCH_TEST_COMMIT)..HEAD

0 commit comments

Comments
 (0)