Merge pull request #2962 from morozov/issues/2961

Fixed code style check failures for pull request against non-master branches

Merge pull request #2962 from morozov/issues/2961
Fixed code style check failures for pull request against non-master branches
dc96d4e0 · Marco Pivetta · GitHub · e3ab1276 · 8695134d · dc96d4e0
Unverified Commit dc96d4e0 authored Jan 04, 2018 by Marco Pivetta Committed by GitHub Jan 04, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

.travis.yml .travis.yml +5 -0

No files found.
--- a/.travis.yml
+++ b/.travis.yml
@@ -306,6 +306,11 @@ jobs:
      if: type = pull_request
      php: 7.2
      script:
+        - |
+          if [ $TRAVIS_BRANCH != "master" ]; then
+            git remote set-branches --add origin $TRAVIS_BRANCH;
+            git fetch origin $TRAVIS_BRANCH;
+          fi
        - git merge-base origin/$TRAVIS_BRANCH $TRAVIS_PULL_REQUEST_SHA || git fetch origin +refs/pull/$TRAVIS_PULL_REQUEST/merge --unshallow
        - wget https://github.com/diff-sniffer/git/releases/download/0.1.0/git-phpcs.phar
        - php git-phpcs.phar origin/$TRAVIS_BRANCH...$TRAVIS_PULL_REQUEST_SHA