Skip to content

GitLab

Unverified Commit cb8dfae5 authored by Nikita Titov's avatar Nikita Titov Committed by GitHub
Browse files

[ci] swap compilers back for CI services (#2730) 

* Update .travis.yml

* Update .vsts-ci.yml
parent f49b0aef
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
.travis.yml
View file @ cb8dfae5
...@@ -44,11 +44,11 @@ before_install: ...@@ -44,11 +44,11 @@ before_install:
- export BUILD_DIRECTORY="$TRAVIS_BUILD_DIR" - export BUILD_DIRECTORY="$TRAVIS_BUILD_DIR"
- if [[ $TRAVIS_OS_NAME == "osx" ]]; then - if [[ $TRAVIS_OS_NAME == "osx" ]]; then
export OS_NAME="macos"; export OS_NAME="macos";
export COMPILER="clang"; export COMPILER="gcc";
export R_MAC_VERSION=3.6.1; export R_MAC_VERSION=3.6.1;
else else
export OS_NAME="linux"; export OS_NAME="linux";
export COMPILER="gcc"; export COMPILER="clang";
export R_TRAVIS_LINUX_VERSION=3.6.1-3bionic; export R_TRAVIS_LINUX_VERSION=3.6.1-3bionic;
fi fi
- export CONDA="$HOME/miniconda" - export CONDA="$HOME/miniconda"
......
.vsts-ci.yml
View file @ cb8dfae5
...@@ -17,7 +17,7 @@ jobs: ...@@ -17,7 +17,7 @@ jobs:
- job: Linux - job: Linux
########################################### ###########################################
variables: variables:
COMPILER: clang COMPILER: gcc
pool: pool:
vmImage: 'ubuntu-16.04' vmImage: 'ubuntu-16.04'
container: ubuntu1404 container: ubuntu1404
...@@ -72,7 +72,7 @@ jobs: ...@@ -72,7 +72,7 @@ jobs:
- job: MacOS - job: MacOS
########################################### ###########################################
variables: variables:
COMPILER: gcc COMPILER: clang
pool: pool:
vmImage: 'macOS-10.13' vmImage: 'macOS-10.13'
strategy: strategy:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment