This repository was archived by the owner on Nov 10, 2022. It is now read-only.
Introduce DEFAULT_BASE_BRANCH environment var to fix diff checking on branch builds#229
Merged
westonruter merged 3 commits intomasterfrom Aug 10, 2017
Merged
Introduce DEFAULT_BASE_BRANCH environment var to fix diff checking on branch builds#229westonruter merged 3 commits intomasterfrom
westonruter merged 3 commits intomasterfrom
Conversation
Contributor
Author
|
@rmccue Thoughts on this approach? |
Merged
westonruter
changed the title
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #197.
The root of the problem for why branch builds would pass when PR builds would fail, and why the branch build would show fewer changed files than the PR build (when
CHECK_SCOPEispatchesorchanged-files), is due to this line:DIFF_BASE=${DIFF_BASE:-$TRAVIS_COMMIT^}Essentially the branch build was only diffing with the previous commit on the branch. As such, the change here is to suggest a
GITHUB_DEFAULT_BRANCHenvironment variable to define what the default branch us for the repo on GitHub (since it doesn't seem to be among the environment vars that Travis exposes), which also assumes that the default branch is going to be the target of the pull request.I'm not 100% certain this is the right approach, but it seems somewhat better than only comparing with the parent commit.