Skip to content

Commit 892c2ef

Browse files
committed
main: Return to using TRAVIS_COMMIT_RANGE (with ... -> .. fix)
Master builds only have a 'git clone ...' [1] so FETCH_HEAD isn't defined and git-validation crashes [2]. This commit partially reverts 8a12a8f (main: default travis commit range is unreliable, 2017-03-21, #13) to avoid that crash. If TRAVIS_COMMIT_RANGE is unset [3], falling back to TRAVIS_COMMIT may be fine. The ... -> .. replacement works around travis-ci/travis-ci#4596 until that is fixed upstream [4]. This avoids pulling in commits from the base tip that aren't reachable from the head tip (e.g. if master has advanced since the PR branched off, and the PR is against master). We only want to check commits that are in the head branch but not in the base branch (more details on the range syntax in [5]). Once the Travis bug does get fixed, the shell replacement will be a no-op. So we don't have to worry about checks breaking once the bug gets fixed, and can periodically poll the bug and remove the workaround at out leisure after the fix. [1]: https://travis-ci.org/opencontainers/runc/jobs/213508696#L243 [2]: https://travis-ci.org/opencontainers/runc/jobs/213508696#L347 [3]: opencontainers/runc#1378 (comment) [4]: travis-ci/travis-ci#4596 [5]: http://git-scm.com/docs/gitrevisions#_specifying_ranges Signed-off-by: W. Trevor King <wking@tremily.us>
1 parent a5aad5a commit 892c2ef

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ before_install:
1111
- mkdir -p $GOPATH/src/github.com/vbatts && ln -sf $(pwd) $GOPATH/src/github.com/vbatts/git-validation && go get ./...
1212

1313
before_script:
14+
- echo $TRAVIS_COMMIT_RANGE
1415
- echo $TRAVIS_COMMIT
1516
- echo $TRAVIS_BRANCH
1617
- echo $TRAVIS_TAG

main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ func main() {
5050
var commitRange = *flCommitRange
5151
if commitRange == "" {
5252
if strings.ToLower(os.Getenv("TRAVIS")) == "true" && !*flNoTravis {
53-
if os.Getenv("TRAVIS_BRANCH") != "" {
54-
commitRange = fmt.Sprintf("%s..FETCH_HEAD", os.Getenv("TRAVIS_BRANCH"))
53+
if os.Getenv("TRAVIS_COMMIT_RANGE") != "" {
54+
commitRange = strings.Replace("...", "..", os.Getenv("TRAVIS_COMMIT_RANGE"))
5555
} else if os.Getenv("TRAVIS_COMMIT") != "" {
5656
commitRange = os.Getenv("TRAVIS_COMMIT")
5757
}

0 commit comments

Comments
 (0)