diff options
| author |  Joel Challis <git@zvecr.com> | 2019-11-13 07:53:05 +0000 |
|---|---|---|
| committer |  James Young <18669334+noroadsleft@users.noreply.github.com> | 2019-11-12 23:53:05 -0800 |
| commit | 7e8f239c2e15091bca82f69c3982e585814c0f70 (patch) | |
| tree | f4c8c090a5ca2dfa83865ac7395de67944ec2da8 /util | |
| parent | 6449bd25518b8d6e44040ae709ff6f51b7db5433 (diff) | |
| download | qmk_firmware-7e8f239c2e15091bca82f69c3982e585814c0f70.tar.gz | |
[CI] Revert to previous logic for branch name and changes (#7343)
Diffstat (limited to 'util')
| -rwxr-xr-x | util/travis_utils.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/util/travis_utils.sh b/util/travis_utils.sh index 031bcda1a..e3d806dfb 100755 --- a/util/travis_utils.sh +++ b/util/travis_utils.sh @@ -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 |