Merge branch 'master' of github.com:statgenlmu/jaatha

statgenlmu · Apr 1, 2017 · 6a04a53 · 6a04a53
2 parents c4dd780 + 4c00275
commit 6a04a53
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,14 +6,16 @@ r:
   - release
   - devel
 
-r_github_packages:
-  - jimhester/lintr 
-  - jimhester/covr
+before_install:
+  # Set CXX1X for R-devel, as R-devel does currently not detect CXX1X support for gcc 4.6.3
+  # Check if we can remove this at some point in 2017
+  - if [[ "$TRAVIS_R_VERSION_STRING" = 'devel' ]]; then mkdir ~/.R && echo 'CXX1X=g++ -std=c++0x -g -O2 -fPIC' > ~/.R/Makevars; fi
+
+r_packages:
+  - lintr
+  - covr
 
 after_success:
   - Rscript -e "lintr::lint_package()"
   - Rscript -e "library(covr); coveralls()"
 
-notifications:
-  email: false
-