Skip to content

Commit 3b1606b

Browse files
authored
Merge pull request #540 from RcppCore/feature/new-travis-script
switch to run.sh for Travis CI (closes #517)
2 parents 01c8f2f + f94aee2 commit 3b1606b

File tree

2 files changed

+14
-16
lines changed

2 files changed

+14
-16
lines changed

.travis.yml

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,29 @@
1-
# Sample .travis.yml for R projects.
2-
#
3-
# See README.md for instructions, or for more configuration options,
4-
# see the wiki:
5-
# https://github.com/craigcitro/r-travis/wiki
1+
# Run Travis CI for R using https://eddelbuettel.github.io/r-travis/
62

73
language: c
84

95
sudo: required
106

7+
dist: trusty
8+
119
env:
1210
global:
13-
- R_BUILD_ARGS="--no-build-vignettes --no-manual"
14-
- R_CHECK_ARGS="--no-build-vignettes --no-manual --as-cran"
1511
- RunAllRcppTests="yes"
16-
- CRAN="http://cran.us.r-project.org"
1712

1813
before_install:
19-
- curl -OL http://raw.github.com/craigcitro/r-travis/master/scripts/travis-tool.sh
20-
- chmod 755 ./travis-tool.sh
21-
- ./travis-tool.sh bootstrap
14+
- curl -OLs http://eddelbuettel.github.io/r-travis/run.sh && chmod 0755 run.sh
15+
# add our launchpad repo which has (inter alia) the r-cran-rbenchmark package
2216
- sudo add-apt-repository -y ppa:edd/misc
23-
- sudo apt-get update -q
17+
- ./run.sh bootstrap
2418

2519
install:
26-
## note that we currently depend on highlight 0.4.4.1 from the PPA as 0.4.5 has issues
27-
- ./travis-tool.sh install_aptget r-cran-runit r-cran-inline r-cran-rbenchmark r-cran-highlight r-cran-pkgkitten
20+
- ./run.sh install_aptget r-cran-runit r-cran-inline r-cran-rbenchmark r-cran-highlight r-cran-pkgkitten
2821

2922
script:
30-
- ./travis-tool.sh run_tests
23+
- ./run.sh run_tests
3124

3225
after_failure:
33-
- ./travis-tool.sh dump_logs
26+
- ./run.sh dump_logs
3427

3528
notifications:
3629
email:
@@ -39,3 +32,4 @@ notifications:
3932
slack:
4033
secure: kUzgzzpgBMc6a+qSjGovfU14U7x9GUXfghDgyF5qBaND/MjFpkmTBfW438Out2buiY+hFNnZc4zThifJM300cOXbcwVentmzuVQ5lLjBhTDvwQgdqytgWr/Ds9dErBeMXr178UD3MJXSOCLhO0wUke2xp2ZsDhsjquT+vFYnuk8=
4134

35+

ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
2016-08-11 Dirk Eddelbuettel <[email protected]>
2+
3+
* .travis.yml: Switch to using run.sh for Travis CI
4+
15
2016-08-09 Artem Klevtsov <[email protected]>
26

37
* inst/include/Rcpp/macros/dispatch.h: Add variadic conditional macro

0 commit comments

Comments
 (0)