switched compilers back

microsoft · Dec 8, 2019 · d98211f · d98211f
1 parent 3285bd4
commit d98211f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -44,11 +44,11 @@ before_install:
   - export BUILD_DIRECTORY="$TRAVIS_BUILD_DIR"
   - if [[ $TRAVIS_OS_NAME == "osx" ]]; then
         export OS_NAME="macos";
-        export COMPILER="clang";
+        export COMPILER="gcc";
         export R_MAC_VERSION=3.6.1;
     else
         export OS_NAME="linux";
-        export COMPILER="gcc";
+        export COMPILER="clang";
         export R_TRAVIS_LINUX_VERSION=3.6.1-3bionic;
     fi
   - export CONDA="$HOME/miniconda"

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
@@ -17,7 +17,7 @@ jobs:
 - job: Linux
 ###########################################
   variables:
-    COMPILER: clang
+    COMPILER: gcc
   pool:
     vmImage: 'ubuntu-16.04'
   container: ubuntu1404
@@ -72,7 +72,7 @@ jobs:
 - job: MacOS
 ###########################################
   variables:
-    COMPILER: gcc
+    COMPILER: clang
   pool:
     vmImage: 'macOS-10.13'
   strategy:

diff --git a/docs/conf.py b/docs/conf.py
@@ -234,7 +234,7 @@ def generate_r_docs(app):
         cmake=3.14.0=h52cb24c_0
     /home/docs/.conda/bin/conda install -q -y -n r_env -c conda-forge \
         r-pkgdown=1.3.0=r351h6115d3f_1000 \
-        r-roxygen2>=7.0.2
+        r-roxygen2=6.1.1=r35h0357c0b_1001
     source /home/docs/.conda/bin/activate r_env
     export TAR=/bin/tar
     cd {0}