Skip to content

Commit e7bc41e

Browse files
authored
Merge pull request #11 from dynverse/devel
various travis fixes
2 parents 8944833 + 596364e commit e7bc41e

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

.travis.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
language: r
22
sudo: required
33
dist: trusty
4+
os:
5+
- linux
6+
- osx
47
cache: packages
58
install:
6-
- if [ `git branch | grep '* master' | wc -l` == 0 ]; then sed -i 's#\(dynverse/[^, ]*\)#\1@devel#' DESCRIPTION; fi
9+
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install libgit2; fi
710
- R -e 'if ("devtools" %in% rownames(installed.packages())) update.packages(oldPkgs = "devtools", ask = FALSE) else install.packages("devtools")'
811
- R -e 'devtools::install_cran("covr")'
9-
- R -e 'setRepositories(ind = 1:4); devtools::install(dependencies = T, upgrade_dependencies = T)'
12+
- R -e 'setRepositories(ind = 1:4); devtools::install(dependencies = TRUE, upgrade_dependencies = TRUE)'
1013
after_success:
1114
- R -e 'covr::codecov()'

cran-comments.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
dynutils 1.0.0 comes with a lot of new functionality,
44
improved documentation and better tests.
55

6+
The notes and errors from the previous release has been fixed.
7+
68
* REMOVED `run_until_exit()`: This functionality is already
79
sufficiently covered by the `processx` package.
810

@@ -41,10 +43,6 @@ I'm not sure what specifically triggers the note message.
4143

4244
## Reverse dependencies
4345

44-
This is a new release, so there are no reverse dependencies.
45-
46-
---
47-
4846
* I have run R CMD check on the 1 downstream dependencies.
4947
(Summary at [revdep/README.md](revdep/README.md)).
5048

0 commit comments

Comments
 (0)