Skip to content

Commit

Permalink
Merge pull request #210 from DeclareDesign/cran-prep
Browse files Browse the repository at this point in the history
Cran prep
  • Loading branch information
jaspercooper committed Nov 12, 2018
2 parents 1b6c13a + 31c5700 commit 1a7096b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 9 deletions.
7 changes: 0 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ matrix:
r_github_packages:
- DeclareDesign/DDtools
- DeclareDesign/DeclareDesign
- ropensci/git2r

- os: linux
r: 3.4
Expand All @@ -20,7 +19,6 @@ matrix:
r_github_packages:
- DeclareDesign/DDtools
- DeclareDesign/DeclareDesign
- ropensci/git2r

- os: linux
r: devel
Expand All @@ -29,23 +27,18 @@ matrix:
r_github_packages:
- DeclareDesign/DDtools
- DeclareDesign/DeclareDesign
- ropensci/git2r

- os: osx
r: release
if: branch = master
r_github_packages:
- DeclareDesign/DDtools
- DeclareDesign/DeclareDesign
- ropensci/git2r

- os: osx
r: 3.4
r_github_packages:
- DeclareDesign/DDtools
- DeclareDesign/DeclareDesign
- ropensci/git2r
if: branch = master

env:
global:
Expand Down
4 changes: 2 additions & 2 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## Test environments

* local OS X install, R 3.5.1
* local Windows install 8 x64 (build 9200), R 3.5.1
* local macOS High Sierra 10.13.6, R 3.5.1
* winbuilder install Windows 8 x64, R Under development (unstable) (2018-11-08 r75566)
* ubuntu 14.04.5 LTS (on travis-ci), R 3.5.1 (2017-01-27)
* ubuntu 14.04.5 LTS (on travis-ci), R 3.4.4 (2017-01-27)
* macOS High Sierra 10.13.3 (on travis-ci), R 3.5.0 (2018-04-23)
Expand Down

0 comments on commit 1a7096b

Please sign in to comment.