Skip to content

Commit fba5d36

Browse files
authored
fix(travis): validate TRAVIS_COMMIT if TRAVIS_PULL_REQUEST_SHA is not set. (#3094)
Looks like the pre-merge travis run sets TRAVIS_PULL_REQUEST_SHA but the post-merge run does not. In the post-merge the TRAVIS_COMMIT should be the PR, so validate it.
1 parent 56fda53 commit fba5d36

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

.travis.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,11 @@ before_script:
3636
- sh -e /etc/init.d/xvfb start
3737
- npm run init
3838
- export $(openssl aes-256-cbc -pass env:CREDENTIALS_PASS -d -in credentials)
39-
- echo "git head commit $(git rev-parse FETCH_HEAD)"
4039
- echo "TRAVIS_COMMIT $TRAVIS_COMMIT"
4140
- echo "TRAVIS_PULL_REQUEST_SHA $TRAVIS_PULL_REQUEST_SHA"
42-
- 'if [ "$VALIDATE_COMMIT_MSG" == "true" ]; then ./scripts/validate-commit-msg.sh $TRAVIS_PULL_REQUEST_SHA; fi'
41+
- COMMIT_TO_VALIDATE=${TRAVIS_PULL_REQUEST_SHA:-TRAVIS_COMMIT}
42+
- echo "COMMIT_TO_VALIDATE $COMMIT_TO_VALIDATE"
43+
- 'if [ "$VALIDATE_COMMIT_MSG" == "true" ]; then ./scripts/validate-commit-msg.sh $COMMIT_TO_VALIDATE; fi'
4344
- 'if [ "$LINT" == "true" ]; then npm run lint; fi'
4445

4546
script:

0 commit comments

Comments
 (0)