Skip to content

Commit

Permalink
Add OSX to Travis build matrix (#3331)
Browse files Browse the repository at this point in the history
  • Loading branch information
MarcusKlik authored and mattdowle committed Jan 30, 2019
1 parent a08547e commit 3ca3f8e
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 1 deletion.
25 changes: 24 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down

0 comments on commit 3ca3f8e

Please sign in to comment.