Skip to content

Commit

Permalink
Try to not use sudo
Browse files Browse the repository at this point in the history
  • Loading branch information
juniorz committed Mar 15, 2017
1 parent 0140e0d commit 627990b
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 10 deletions.
21 changes: 14 additions & 7 deletions .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
Expand All @@ -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}
Expand Down
13 changes: 10 additions & 3 deletions ci/install-deps-linux
Expand Up @@ -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
Expand Down

0 comments on commit 627990b

Please sign in to comment.