Merge branch 'master' of https://github.com/kwb-r/kwb.pubs

KWB-R · Jan 10, 2020 · c405dda · c405dda
2 parents 050f156 + 86dd651
commit c405dda
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -7,7 +7,7 @@
 ^docs$
 ^_pkgdown\.yml$
 ^LICENSE\.md$
-^.travis\.yml$
+^\.travis\.yml$
 ^.gitlab-ci\.yml$
 ^appveyor\.yml$
 ^index\.Rmd$

diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,15 @@
+##############################################################################
+### Autogenerated with R package kwb.pkgbuild v0.1.1
+### (installed from 'Github (kwb-r/kwb.pkgbuild@0ac3694)' source code on 2019-09-09)
+### by calling the function kwb.pkgbuild::use_travis()
+### (file created at: 2019-09-09 09:15:29)
+##############################################################################
+
+
 language: r
 sudo: required
-before_install:
-- sudo apt-get install libmagick++-dev
+before_install: 
+- sudo apt-get install -y libmagick++-dev
 cache: packages
 r_packages:
 - remotes
@@ -18,4 +26,8 @@ matrix:
  provider: script
  script: Rscript -e 'pkgdown::deploy_site_github(verbose = TRUE)'
  skip_cleanup: 'true'
+ on:
+ branch: 
+ - master
+ - dev
  - r: oldrel