diff --git a/.travis.yml b/.travis.yml index 61ea06f93..317748f2c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,26 @@ branches: only: - "master" +r: + - oldrel + - release + - devel + +os: + - linux + - osx + +matrix: + exclude: + - r: devel # exclude osx r-devel build as it is currently unstable + os: osx + +before_install: + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install llvm && + export PATH="/usr/local/opt/llvm/bin:$PATH" && + export LDFLAGS="-L/usr/local/opt/llvm/lib" && + export CFLAGS="-I/usr/local/opt/llvm/include"; fi + r_packages: - covr - drat @@ -25,7 +45,10 @@ before_script: after_success: - travis_wait Rscript -e 'library(covr);codecov()' - - test $TRAVIS_REPO_SLUG == "Rdatatable/data.table" && test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "master" && bash deploy.sh + - test $TRAVIS_REPO_SLUG == "Rdatatable/data.table" && + test $TRAVIS_PULL_REQUEST == "false" && + test $TRAVIS_BRANCH == "master" && + bash deploy.sh notifications: email: diff --git a/NEWS.md b/NEWS.md index 431db5000..140134fd2 100644 --- a/NEWS.md +++ b/NEWS.md @@ -14,6 +14,8 @@ 2. As promised in new feature 6 of v1.11.6 Sep 2018 (see below in this file), the `datatable.CJ.names` option's default is now `TRUE`. In v1.13.0 it will be removed. +3. The Travis build matrix is expanded to OSX and to the R previous major and R-devel releases [#3326](https://github.com/Rdatatable/data.table/issues/3326). An OpenMP enabled compiler is required to correctly build on OSX, therefore the homebrew llvm package is installed on the Travis (OSX) machine before R CMD build is run. The OSX build on R-devel was explicitly excluded because it's currently unstable. Thanks @marcusklik for the PR. + ### Changes in v1.12.0 (13 Jan 2019)