From a8c48cb2d7f9bc8207b3893fc8679ec675708ded Mon Sep 17 00:00:00 2001 From: "Matthijs S. Berends" Date: Sun, 10 Nov 2019 09:21:43 +0100 Subject: [PATCH] (v0.8.0.9025) appveyor fix --- DESCRIPTION | 2 +- NEWS.md | 2 +- appveyor.yml | 6 ++---- docs/404.html | 2 +- docs/LICENSE-text.html | 2 +- docs/articles/index.html | 2 +- docs/authors.html | 2 +- docs/index.html | 2 +- docs/news/index.html | 8 ++++---- docs/reference/index.html | 2 +- tests/appveyor/appveyor_tool.ps1 | 4 +++- tests/appveyor/travis_tool.sh | 6 ++++-- 12 files changed, 21 insertions(+), 19 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index df72f4b5..fc234fc8 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: AMR -Version: 0.8.0.9024 +Version: 0.8.0.9025 Date: 2019-11-10 Title: Antimicrobial Resistance Analysis Authors@R: c( diff --git a/NEWS.md b/NEWS.md index 2ce396f0..a22114a2 100755 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# AMR 0.8.0.9024 +# AMR 0.8.0.9025 Last updated: 10-Nov-2019 ### New diff --git a/appveyor.yml b/appveyor.yml index 753f6b06..158af23c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -19,12 +19,10 @@ # Visit our website for more info: https://msberends.gitlab.io/AMR. # # ==================================================================== # -# Download script file from GitHub init: ps: | $ErrorActionPreference = "Stop" - Invoke-WebRequest https://gitlab.com/msberends/AMR/raw/master/tests/appveyor/appveyor_tool.ps1 -OutFile "..\appveyor-tool.ps1" - Import-Module '..\appveyor-tool.ps1' + Import-Module 'tests\appveyor\appveyor_tool.ps1' install: ps: Bootstrap @@ -44,7 +42,7 @@ environment: matrix: - R_VERSION: oldrel - R_VERSION: release - # - R_VERSION: devel # 9 nov 19: searches for R 4.0 and now fails... + - R_VERSION: devel # 9 nov 19: searches for R 4.0 and now fails... matrix: allow_failures: diff --git a/docs/404.html b/docs/404.html index 78ace261..91d80631 100644 --- a/docs/404.html +++ b/docs/404.html @@ -84,7 +84,7 @@ AMR (for R) - 0.8.0.9024 + 0.8.0.9025 diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html index 25e767ec..7a195f96 100644 --- a/docs/LICENSE-text.html +++ b/docs/LICENSE-text.html @@ -84,7 +84,7 @@ AMR (for R) - 0.8.0.9024 + 0.8.0.9025 diff --git a/docs/articles/index.html b/docs/articles/index.html index c9bf90b3..ee9fe6a8 100644 --- a/docs/articles/index.html +++ b/docs/articles/index.html @@ -84,7 +84,7 @@ AMR (for R) - 0.8.0.9024 + 0.8.0.9025 diff --git a/docs/authors.html b/docs/authors.html index 1a8dd9c0..95547093 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -84,7 +84,7 @@ AMR (for R) - 0.8.0.9024 + 0.8.0.9025 diff --git a/docs/index.html b/docs/index.html index b1e94f1f..43448f0c 100644 --- a/docs/index.html +++ b/docs/index.html @@ -45,7 +45,7 @@ AMR (for R) - 0.8.0.9024 + 0.8.0.9025 diff --git a/docs/news/index.html b/docs/news/index.html index 3963e609..278ee1b5 100644 --- a/docs/news/index.html +++ b/docs/news/index.html @@ -84,7 +84,7 @@ AMR (for R) - 0.8.0.9024 + 0.8.0.9025 @@ -231,9 +231,9 @@ -
+

-AMR 0.8.0.9024 Unreleased +AMR 0.8.0.9025 Unreleased

Last updated: 10-Nov-2019

@@ -1333,7 +1333,7 @@ Using as.mo(..., allow_uncertain = 3)

Contents

    -
  • 0.8.0.9024
    • +
  • 0.8.0.9025
  • 0.8.0
  • 0.7.1
  • 0.7.0
    • diff --git a/docs/reference/index.html b/docs/reference/index.html index cd82c229..4bc8d168 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -84,7 +84,7 @@ AMR (for R) - 0.8.0.9024 + 0.8.0.9025
diff --git a/tests/appveyor/appveyor_tool.ps1 b/tests/appveyor/appveyor_tool.ps1 index 8586f9ed..bc3fd64f 100644 --- a/tests/appveyor/appveyor_tool.ps1 +++ b/tests/appveyor/appveyor_tool.ps1 @@ -172,7 +172,9 @@ Function Bootstrap { } Progress "Downloading and installing travis_tool.sh" - Invoke-WebRequest https://gitlab.com/msberends/AMR/raw/master/tests/appveyor/travis_tool.sh -OutFile "..\travis_tool.sh" + + cp "tests\appveyor\travis_tool.sh" "..\travis_tool.sh" + # Invoke-WebRequest https://gitlab.com/msberends/AMR/raw/master/tests/appveyor/travis_tool.sh -OutFile "..\travis_tool.sh" echo '@bash.exe ../travis_tool.sh %*' | Out-File -Encoding ASCII .\travis_tool.sh.cmd cat .\travis_tool.sh.cmd bash -c "( echo; echo '^travis_tool\.sh\.cmd$' ) >> .Rbuildignore" diff --git a/tests/appveyor/travis_tool.sh b/tests/appveyor/travis_tool.sh index 22d968e2..54cc6a33 100644 --- a/tests/appveyor/travis_tool.sh +++ b/tests/appveyor/travis_tool.sh @@ -148,8 +148,6 @@ BootstrapMacOptions() { } EnsureDevtools() { - # force install Rcpp - RBinaryInstall Rcpp if ! Rscript -e 'if (!("devtools" %in% rownames(installed.packages()))) q(status=1)' ; then # Install devtools and testthat. RBinaryInstall devtools testthat @@ -157,6 +155,10 @@ EnsureDevtools() { } EnsureRemotes() { + if ! Rscript -e 'if (!("Rcpp" %in% rownames(installed.packages()))) q(status=1)' ; then + # Install remotes. + RBinaryInstall Rcpp + fi if ! Rscript -e 'if (!("remotes" %in% rownames(installed.packages()))) q(status=1)' ; then # Install remotes. RBinaryInstall remotes