Skip to content

Commit

Permalink
Appveyor: Remove "package installation workaround" (#2464)
Browse files Browse the repository at this point in the history
The `pkgbuild` bug is fixed and we can use the latest version of *tic* again. 

To get a green build, we need to set a `Makevars.win` file to meet the C++ standards on Windows.

I faced some errors with the `digest` installation in some tries and installing it explicitly helped. Don't wanna run more builds with and without cache, maybe the issue also came from a faulty cache. 

*tic* hasn't yet changed the arguments of `step_rcmdcheck()`. This only happened in my fork so we need to use the "old" `warnings_are_errors` and `notes_are_errors` arguments again.
  • Loading branch information
pat-s committed Oct 24, 2018
1 parent acde684 commit 7e1b537
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Expand Up @@ -24,7 +24,7 @@ jobs:
- libproj-dev # for sf
- libgeos-dev # for sf
- libudunits2-dev # for sf
before_install: R -q -e 'if (!requireNamespace("devtools")) install.packages("devtools"); if (!requireNamespace("curl")) install.packages("curl"); devtools::install_github("ropenscilabs/tic@rcmdcheck"); tic::prepare_all_stages(); tic::before_install()'
before_install: R -q -e 'if (!requireNamespace("devtools")) install.packages("devtools"); if (!requireNamespace("curl")) install.packages("curl"); devtools::install_github("ropenscilabs/tic"); tic::prepare_all_stages(); tic::before_install()'
install: R -q -e 'tic::install()'
script: true
after_script: R -q -e 'tic::after_script()'
Expand All @@ -39,7 +39,7 @@ jobs:
- libproj-dev # for sf
- libgeos-dev # for sf
- libudunits2-dev # for sf
before_install: R -q -e 'if (!requireNamespace("devtools")) install.packages("devtools"); if (!requireNamespace("curl")) install.packages("curl"); devtools::install_github("ropenscilabs/tic@rcmdcheck"); tic::prepare_all_stages(); tic::before_install()'
before_install: R -q -e 'if (!requireNamespace("devtools")) install.packages("devtools"); if (!requireNamespace("curl")) install.packages("curl"); devtools::install_github("ropenscilabs/tic"); tic::prepare_all_stages(); tic::before_install()'
warnings_are_errors: false
before_script: R -q -e 'tic::before_script()'
script: R -q -e 'tic::script()'
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Expand Up @@ -13,7 +13,7 @@ install:
- cmd: rm -rf C:\RLibrary\00LOCK-*
- cmd: R -q -e "if (!requireNamespace('devtools')) install.packages('devtools')"
- cmd: R -q -e "if (!requireNamespace('curl')) install.packages('curl')"
- cmd: R -q -e "devtools::install_github('ropenscilabs/tic@rcmdcheck'); tic::prepare_all_stages()"
- cmd: R -q -e "devtools::install_github('ropenscilabs/tic'); tic::prepare_all_stages()"


cache:
Expand Down
1 change: 1 addition & 0 deletions src/Makevars.win
@@ -0,0 +1 @@
PKG_CPPFLAGS += -std=gnu99
6 changes: 2 additions & 4 deletions tic.R
Expand Up @@ -9,6 +9,7 @@ if (Sys.getenv("RCMDCHECK") == "TRUE") {

get_stage("install") %>%
add_step(step_install_cran("stringi", type = "both")) %>%
add_step(step_install_cran("digest", type = "both")) %>%
add_code_step(if (length(trimws(strsplit(Sys.getenv("WARMUPPKGS"), " ")[[1]])[!trimws(strsplit(Sys.getenv("WARMUPPKGS"), " ")[[1]]) %in% installed.packages()]) > 0) {
paste0("Installing WARMUPPKGS", trimws(strsplit(Sys.getenv("WARMUPPKGS"), " ")[[1]])[!trimws(strsplit(Sys.getenv("WARMUPPKGS"), " ")[[1]]) %in% installed.packages()])
install.packages(trimws(strsplit(Sys.getenv("WARMUPPKGS"), " ")[[1]])[!trimws(strsplit(Sys.getenv("WARMUPPKGS"), " ")[[1]]) %in% installed.packages()])
Expand All @@ -24,10 +25,7 @@ if (Sys.getenv("RCMDCHECK") == "TRUE") {

get_stage("script") %>%
add_code_step(devtools::document()) %>%
# manual approch until https://github.com/r-lib/rcmdcheck/issues/83#issuecomment-424314978 is solved
add_code_step(devtools::build(manual = TRUE)) %>%
add_step(step_rcmdcheck(path = "../mlr_2.13.9000.tar.gz", args = "--as-cran",
error_on = "error"))
add_step(step_rcmdcheck("--as-cran", warnings_are_errors = FALSE, notes_are_errors = FALSE))

if (!Sys.getenv("TRAVIS_EVENT_TYPE") == "cron") {

Expand Down

0 comments on commit 7e1b537

Please sign in to comment.