Merge pull request #1583 from prymitive/debug

fix(ci): better handling of merges in percy-skip-deps.sh

.travis.yml

@@ -147,9 +147,7 @@ jobs:
       env:
         - NODE_ENV=test
         - secure: "DTDy4as3DV3QUw6LWNInEh2iFXrsMuMnb+WRNSwORu8OcgyLKVNrQ5SwQLV1lm0RFTCEN+sSxjOJwQp5PXEgLXcT/MP5xfg2p3HDEj7k7GqJLI4OykYpdh7YHGaX+cAGsrjPfuWAf7pdBlYplEDdGHGkK9BLkBIx6owkzvw0Z8Je3+kTxRAae8vIXpzmgiN+NGzP14UF92tky+/ZS2aLrhqVbTpWEP5j0mEhOpy6Ebh31nCTuW2FA+8oD0HVckC/JTLbIGPQgpzLrdEEE/imjZB9Gx4022lkcuZjf8u+hRytgqKp93l01MPxHrGCZ9V18r3QFZCAXGtFh8dg8xSAvk1cvFfJUDHkW1XhaUdsLubGI7zDw111N+5Do9L3MjJ2jd1x7ZPUSJwKUGPeRw/7CsNDPtC2Pcmkdb3D0SNeH4ia/L43A9+e3nuJ6vthAkEd7zBIcp9diVJ2nyry0d5YdFQStezksJgFADOO/OleMyMhLTdqBUE7sFf7QtD6R9nhZuIe//3UGVRuTJJmDU8wZEzK8CUyhPjbnpMTMbyq8bIYIk96E5Nrxp65RDOv9pPpvPfHf0WvALn/fmwa79AUafugYDoAXokv1RqrU0L977MRwEDDkGOuO1civoudfNQ2sAh6SR1eaSp9AygJgvpodLy1lEJZm3VxffjrSNdoejU="
-      script:
-        - git fetch origin master
-        - scripts/percy-skip-deps.sh FETCH_HEAD $TRAVIS_COMMIT || make test-percy
+      script: ./scripts/percy-skip-deps.sh || make test-percy
 
     - stage: Build and Deploy
       name: Cross compile binaries

scripts/percy-skip-deps.sh

@@ -3,9 +3,16 @@
 set -o errexit
 set -o pipefail
 
-env | grep TRAVIS | sort
 
-git log --no-merges --name-only --pretty=format: ${1}..${2} | grep -Ev '^$' | sort | uniq | while read FILE ; do
+if [ "${TRAVIS_BRANCH}" == "master" ] && [ -n ${TRAVIS_COMMIT_RANGE} ]; then
+  RANGE="${TRAVIS_COMMIT_RANGE}"
+else
+  git fetch origin master
+  RANGE="FETCH_HEAD...${TRAVIS_COMMIT}"
+fi
+
+
+git log --no-merges --name-only --pretty=format: ${RANGE} | grep -Ev '^$' | sort | uniq | while read FILE ; do
   if [[ "${FILE}" =~ ^ui/src/.+ ]]; then
     echo "[P] ${FILE}"
     exit 1