From a8e60377b25ec99ec67ba7e703373cc708dd50b7 Mon Sep 17 00:00:00 2001
From: Jonathan Goldfarb <jgoldfar@gmail.com>
Date: Wed, 26 Sep 2018 14:10:50 -0400
Subject: [PATCH] Try making the CI script a bit more idiomatic

---
 .travis.yml | 36 ++++++++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3973828..7001910 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,25 +1,49 @@
 language: cpp
+
+sudo: true
+
+os:
+  - linux
+#  - osx # TODO: enable
+
 compiler: gcc
+
 addons:
+  apt:
+    update: true
+    sourceline: 'ppa:fontforge/fontforge'
+    packages: 
+      - libpoppler-private-dev
+      - libcairo-dev
+      - libpoppler-dev
+      - libspiro-dev
+      - libcairo-dev
+      - libpango1.0-dev
+      - libfreetype6-dev
+      - libltdl-dev
+      - libfontforge-dev
+      - python-imaging
+      - python-pip
+      - firefox
+      - xvfb
   sauce_connect: true
+
 before_install:
-  - sudo add-apt-repository ppa:fontforge/fontforge --yes
-  - sudo add-apt-repository ppa:coolwanglu/pdf2htmlex --yes
-  - sudo apt-get update -qq
-  - sudo apt-get install -qq libpoppler-dev libpoppler-private-dev libspiro-dev libcairo-dev libpango1.0-dev libfreetype6-dev libltdl-dev libfontforge-dev python-imaging python-pip firefox xvfb
-  - sudo pip install selenium sauceclient
+  - pip install --user selenium sauceclient
   - export DISPLAY=:99.0
   - test/start_xvfb.sh
   - pushd /
   - python -m SimpleHTTPServer 8000 >/dev/null 2>&1 &
   - popd
   - sleep 5
+
 before_script: 
   - cmake -DENABLE_SVG=ON .
+
 script:
   - make
   - P2H_TEST_REMOTE=1 ctest --output-on-failure --verbose
-  - sudo make install
+  - make install
   - /usr/local/bin/pdf2htmlEX -v
 
 env: