From e2f11bec4c92e8816675decabb34a33cf4b96d69 Mon Sep 17 00:00:00 2001
From: "Mathew W. McLean" <mathew.w.mclean@gmail.com>
Date: Wed, 30 Aug 2017 01:00:16 +1000
Subject: [PATCH] fix travis

---
 .travis.yml | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dec35df..39e5673 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,15 @@
-language: R
+language: r
+r:
+  - release
+
 dist: trusty  # ubuntu 14.04 has additional libraries available
 sudo: required
-cache: packages
-before_cache:
-  - sudo rm -rf $HOME/R/Library/flip*
-  - sudo rm -rf $HOME/R/Library/rhtml*
+
+cache: false
+# before_cache:
+#   - sudo rm -rf $HOME/R/Library/flip*
+#   - sudo rm -rf $HOME/R/Library/rhtml*
+
 warnings_are_errors: false
 
 # install debian libraries to match R-servers
@@ -12,11 +17,18 @@ warnings_are_errors: false
 before_install:
   - sudo apt-get -qq update
   - sudo apt-get install -y libgdal-dev libproj-dev python-protobuf libprotoc-dev libprotobuf-dev libv8-dev librsvg2-dev
+
+r_packages:
+  - roxygen2
+  - covr
+
+r_github_packages:
+  - Displayr/flipExampleData
+  - Displayr/travisCI
+
 script:
   - R CMD build --no-manual --no-build-vignettes --no-resave-data .
-  - sudo Rscript -e 'require(devtools); install_github("Displayr/flipExampleData")'
   - R CMD check --as-cran --no-manual --no-build-vignettes --no-tests *.tar.gz
-  - sudo Rscript -e 'install.packages("roxygen2")'
   - if [ -d tests/testthat ]; then Rscript --default-packages='datasets,utils,grDevices,graphics,stats,methods' -e 'res<-devtools::test(); df <- as.data.frame(res); pass <- sum(df$failed)==0 && all(!df$error); write.csv(df, file="test_results.csv"); quit(status=1-pass, save="no")'; fi
 
 notifications:
@@ -31,5 +43,6 @@ notifications:
 # Warning notifications and downstream package builds are implemented
 # by calling R functions so they can be updated in this package without
 # committing a new change to .travis.yml in each repository
-after_success: >-
-  Rscript -e "require(devtools); install_github('Displayr/travisCI'); travisCI::NotifyWarnings(); travisCI::TriggerDownstreamBuilds()"
+after_success: 
+  - Rscript -e "travisCI::NotifyWarnings(); travisCI::TriggerDownstreamBuilds()"
+  - Rscript -e "covr::coveralls(type = 'all')"