diff --git a/.travis.yml b/.travis.yml index 5454a082..2756b522 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,18 +1,21 @@ dist: trusty -sudo: required language: go -branches: - except: - - windows + +addons: + apt: + packages: + - libgtk-3-dev + - gettext + - libglib2.0-dev + - libc6-dev-i386 + - xvfb + go: - tip - 1.8 - 1.7.5 - 1.6.4 -services: - - docker - matrix: include: - go: 1.7.5 @@ -27,6 +30,10 @@ matrix: - env: RELEASE=true fast_finish: true +branches: + except: + - windows + before_install: - "export DISPLAY=:99.0" - ci/install-deps-${TRAVIS_OS_NAME:-linux} diff --git a/ci/install-deps-linux b/ci/install-deps-linux index 02f2b380..c5e50bee 100755 --- a/ci/install-deps-linux +++ b/ci/install-deps-linux @@ -2,9 +2,16 @@ set -x -sudo apt-get update -qq -sudo apt-get install -qq -y libgtk-3-dev gettext libglib2.0-dev libc6-dev-i386 -sudo apt-get install -qq -y xvfb +# This is now in travis file wo we dont need to use sudo +#sudo apt-get update -qq +#sudo apt-get install -qq -y libgtk-3-dev gettext libglib2.0-dev libc6-dev-i386 +#sudo apt-get install -qq -y xvfb + +# +# GUI tests seems to be disabled +# +exit 0 + # sudo /usr/bin/Xvfb $DISPLAY 2>&1 > /dev/null & sh -e /etc/init.d/xvfb start sleep 3 # wait for xvfb