From c56f8e75d100446ad925a70b9300a4b85d7716d3 Mon Sep 17 00:00:00 2001
From: Laura DeCicco <ldecicco@usgs.gov>
Date: Mon, 20 Mar 2017 14:49:28 -0500
Subject: [PATCH 1/5] Let's try this.

---
 .travis.yml | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f51d086..e908c2a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,16 @@
 # see the wiki:
 #   https://github.com/craigcitro/r-travis/wiki
 
-language: objective-c
-sudo: required
+language: r
+cache: packages
+r:
+#  - oldrel
+  - release
+  - devel
+sudo: false
+
+repos:
+  CRAN: https://cloud.r-project.org
 
 env:
    global:
@@ -14,17 +22,11 @@ env:
      - R_CHECK_ARGS="--no-build-vignettes --no-manual --as-cran"
      - BOOTSTRAP_LATEX=""
      - NOT_CRAN="true"
+     
+warnings_are_errors: true
 
-before_install:
-  - curl -OL http://raw.github.com/craigcitro/r-travis/master/scripts/travis-tool.sh
-  - chmod 755 ./travis-tool.sh
-  - ./travis-tool.sh bootstrap
-
-install:
-  - ./travis-tool.sh install_deps
-  - ./travis-tool.sh install_r covr
-
-script: ./travis-tool.sh run_tests
+r_github_packages:
+  - jimhester/covr
 
 after_success:
   - Rscript -e 'covr::coveralls()'
-- 
GitLab


From 36cf963ab7a50f355375ebd44b907e9bda2b530f Mon Sep 17 00:00:00 2001
From: Laura DeCicco <ldecicco@usgs.gov>
Date: Mon, 20 Mar 2017 15:09:39 -0500
Subject: [PATCH 2/5] Does that help?

---
 .travis.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e908c2a..e30db7d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,6 @@ env:
      - R_LIBS="http://cran.rstudio.com"
      - R_BUILD_ARGS="--no-build-vignettes --no-manual"
      - R_CHECK_ARGS="--no-build-vignettes --no-manual --as-cran"
-     - BOOTSTRAP_LATEX=""
      - NOT_CRAN="true"
      
 warnings_are_errors: true
@@ -31,9 +30,6 @@ r_github_packages:
 after_success:
   - Rscript -e 'covr::coveralls()'
 
-after_failure:
-  - ./travis-tool.sh dump_logs
-
 notifications:
   email:
     on_success: change
-- 
GitLab


From f4e69e2ba7e6086ca3bf11c232d9bdcd8a0242fa Mon Sep 17 00:00:00 2001
From: Laura DeCicco <ldecicco@usgs.gov>
Date: Mon, 20 Mar 2017 15:16:59 -0500
Subject: [PATCH 3/5] Don't use those in examples anymore

---
 DESCRIPTION | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index 55a1f75..88aaa52 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -40,9 +40,7 @@ Imports:
 Suggests:
     xtable,
     knitr,
-    testthat,
-    geojsonio,
-    leaflet
+    testthat
 VignetteBuilder: knitr
 BuildVignettes: true
 BugReports: https://github.com/USGS-R/dataRetrieval/issues
-- 
GitLab


From c3bb2b10741cb6ed42ba0ffa001e34147cbd05cf Mon Sep 17 00:00:00 2001
From: Laura DeCicco <ldecicco@usgs.gov>
Date: Mon, 20 Mar 2017 15:47:35 -0500
Subject: [PATCH 4/5] Extend how long it is allowed to do tests.

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

diff --git a/.travis.yml b/.travis.yml
index e30db7d..9923057 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,18 +12,18 @@ r:
   - devel
 sudo: false
 
-repos:
-  CRAN: https://cloud.r-project.org
-
 env:
    global:
      - R_LIBS="http://cran.rstudio.com"
      - R_BUILD_ARGS="--no-build-vignettes --no-manual"
      - R_CHECK_ARGS="--no-build-vignettes --no-manual --as-cran"
      - NOT_CRAN="true"
+     - _R_CHECK_FORCE_SUGGESTS_=false
      
 warnings_are_errors: true
 
+install: travis_wait 20 mvn install
+
 r_github_packages:
   - jimhester/covr
 
-- 
GitLab


From a1a7ce39209977e75cd61c2e7e797cd9edc8afef Mon Sep 17 00:00:00 2001
From: Laura DeCicco <ldecicco@usgs.gov>
Date: Mon, 20 Mar 2017 16:17:29 -0500
Subject: [PATCH 5/5] libcurl?

---
 .travis.yml | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9923057..fcff2b1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,15 +6,25 @@
 
 language: r
 cache: packages
-r:
-#  - oldrel
-  - release
-  - devel
+matrix:
+  include:
+    - os: linux
+      r: release
+    - os: linux
+      r: devel
+    - os: linux
+      dist: trusty
+      env: R_CODECOV=true
+      r_check_args: '--no-build-vignettes --no-manual --as-cran'
 sudo: false
 
+addons:
+  apt:
+    packages:
+    - libcurl4-openssl-dev
+
 env:
    global:
-     - R_LIBS="http://cran.rstudio.com"
      - R_BUILD_ARGS="--no-build-vignettes --no-manual"
      - R_CHECK_ARGS="--no-build-vignettes --no-manual --as-cran"
      - NOT_CRAN="true"
@@ -22,14 +32,12 @@ env:
      
 warnings_are_errors: true
 
-install: travis_wait 20 mvn install
-
 r_github_packages:
   - jimhester/covr
 
 after_success:
-  - Rscript -e 'covr::coveralls()'
-
+  - if [[ "${R_CODECOV}" ]]; then R -e 'covr::codecov()'; fi
+  
 notifications:
   email:
     on_success: change
-- 
GitLab