Skip to content

Commit 653b4ae

Browse files
authored
Merge pull request #1092 from RcppCore/feature/travis_update
generate package and version from DESCRIPTION, use bionic
2 parents ddb9ded + dc1af8a commit 653b4ae

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

.travis.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Made by Dirk Eddelbuettel in August 2018 and released under GPL (>=2)
44

55
os: linux
6-
dist: trusty
6+
dist: bionic
77
sudo: required
88
services: docker
99

@@ -25,6 +25,9 @@ env:
2525
- DOCKER_OPTS="--rm -ti -v $(pwd):/mnt -w /mnt"
2626
R_BLD_OPTS="--no-build-vignettes --no-manual"
2727
R_CHK_OPTS="--no-vignettes --no-manual"
28+
PKG_NAME=$(awk '/Package:/ {print $2}' DESCRIPTION)
29+
PKG_VER=$(awk '/Version:/ {print $2}' DESCRIPTION)
30+
PKG_TGZ="${PKG_NAME}_${PKG_VER}.tar.gz"
2831

2932
before_install:
3033
- docker pull ${DOCKER_CNTR}
@@ -35,7 +38,7 @@ install:
3538
- docker run ${DOCKER_OPTS} ${DOCKER_CNTR} ${R} CMD build ${R_BLD_OPTS} .
3639

3740
script:
38-
- if [[ "${COVR}" == "no" ]]; then docker run ${DOCKER_OPTS} ${DOCKER_CNTR} ${R} CMD check ${R_CHK_OPTS} Rcpp_*.tar.gz; fi
41+
- if [[ "${COVR}" == "no" ]]; then docker run ${DOCKER_OPTS} ${DOCKER_CNTR} ${R} CMD check ${R_CHK_OPTS} ${PKG_TGZ}; fi
3942
- if [[ "${COVR}" == "yes" ]]; then docker run ${DOCKER_OPTS} -e CODECOV_TOKEN ${DOCKER_CNTR} r -l covr -e 'codecov()'; fi
4043

4144
notifications:

ChangeLog

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
2020-06-19 Dirk Eddelbuettel <[email protected]>
2+
3+
* .travis.yml: Determine package name and version from DESCRIPTION,
4+
switch to bionic
5+
16
2020-06-14 Dirk Eddelbuettel <[email protected]>
27

38
* inst/bib/Rcpp.bib: Add John's new 'S, R, and Data Science' article

0 commit comments

Comments
 (0)