diff --git a/.travis.yml b/.travis.yml index 9f8694d525..8b47c10218 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,10 +14,9 @@ notifications: secure: mkHfRTsuxidtOOORbJJ0Jspb/DSa8jAiQwWWUljqLwefy1p4HGC9P/rLdXXg3vsjiulCzyjEkfvDWAHXvu34GhGWfQuD8U140Fon1Os3AO5Hbme+yRmjXmTcgH8XetSLQufyBBMqXHMd6o1tkxXql1p54G1IShhgAdPNe76d5ZE= before_install: -- npm install -g grunt-cli +- npm install -g grunt-cli protractor before_script: -- export REMOTE=ajoslin - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start diff --git a/scripts/travis/ci.sh b/scripts/travis/ci.sh index f4a859bc7c..837b8587f0 100755 --- a/scripts/travis/ci.sh +++ b/scripts/travis/ci.sh @@ -43,8 +43,7 @@ function run { exit 0 fi - LATEST_TAG=$(git describe --tags --abbrev=0) - LATEST_TAG_COMMIT=$(git rev-list $LATEST_TAG | head -n 1) + LATEST_TAG_COMMIT=$(git rev-list $(git describe --tags --abbrev=0) | head -n 1) if [[ "$TRAVIS_COMMIT" == "$LATEST_TAG_COMMIT" ]]; then IS_RELEASE=true