main: default travis commit range is unreliable

opencontainers/runc#1378 (comment) points to an alternate approach. Reported-by: Mrunal Patel <[email protected]> Signed-off-by: Vincent Batts <[email protected]>
wking · Mar 21, 2017 · 8a12a8f · 8a12a8f
1 parent 3fd57e3
commit 8a12a8f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,11 +10,17 @@ before_install:
   - go get -u github.com/golang/lint/golint
   - mkdir -p $GOPATH/src/github.com/vbatts && ln -sf $(pwd) $GOPATH/src/github.com/vbatts/git-validation && go get ./...
 
+before_script:
+  - echo $TRAVIS_COMMIT
+  - echo $TRAVIS_BRANCH
+  - echo $TRAVIS_TAG
+  - echo $TRAVIS_BUILD_NUMBER
+  - echo $TRAVIS_REPO_SLUG
+
 install: true
 
 script:
   - go vet -x ./...
   - golint ./...
   - go build .
-  - go test -v ./...
-
+  - go test -v ./...
diff --git a/main.go b/main.go
@@ -50,8 +50,8 @@ func main() {
 	var commitRange = *flCommitRange
 	if commitRange == "" {
 		if strings.ToLower(os.Getenv("TRAVIS")) == "true" && !*flNoTravis {
-			if os.Getenv("TRAVIS_COMMIT_RANGE") != "" {
-				commitRange = os.Getenv("TRAVIS_COMMIT_RANGE")
+			if os.Getenv("TRAVIS_BRANCH") != "" {
+				commitRange = fmt.Sprintf("%s..FETCH_HEAD", os.Getenv("TRAVIS_BRANCH"))
 			} else if os.Getenv("TRAVIS_COMMIT") != "" {
 				commitRange = os.Getenv("TRAVIS_COMMIT")
 			}