]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
[CI] Revert to previous logic for branch name and changes (#7343)
authorJoel Challis <git@zvecr.com>
Wed, 13 Nov 2019 07:53:05 +0000 (07:53 +0000)
committerJames Young <18669334+noroadsleft@users.noreply.github.com>
Wed, 13 Nov 2019 07:53:05 +0000 (23:53 -0800)
util/travis_utils.sh

index 031bcda1a82c0e2b1ae3df2dbc6757ef04f43676..e3d806dfbaef8d0217650b15621b66a15d5f6aa6 100755 (executable)
@@ -10,8 +10,8 @@ TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE:-HEAD~1..HEAD}"
 #TRAVIS_COMMIT_RANGE="c287f1bfc5c8...81f62atc4c1d"
 
 # Extra variables
-LOCAL_BRANCH=${TRAVIS_PULL_REQUEST_BRANCH:-${TRAVIS_BRANCH}}
-QMK_CHANGES=$(git diff --name-only HEAD ${TRAVIS_BRANCH})
+LOCAL_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+QMK_CHANGES=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE})
 
 # if docker is installed - patch calls to within the qmk docker image
 if command -v docker >/dev/null; then