P281424
/
AMR
mirror of https://github.com/msberends/AMR.git
1
0
Fork 0
Code Releases Activity

(v0.8.0.9025) appveyor fix

This commit is contained in:
dr. M.S. (Matthijs) Berends 2019-11-10 09:21:43 +01:00
parent 07f945de53
commit a8c48cb2d7
12 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DESCRIPTION
View File

@ -1,5 +1,5 @@
Package: AMR Package: AMR
Version: 0.8.0.9024 Version: 0.8.0.9025
Date: 2019-11-10 Date: 2019-11-10
Title: Antimicrobial Resistance Analysis Title: Antimicrobial Resistance Analysis
Authors@R: c( Authors@R: c(

2
NEWS.md
View File

@ -1,4 +1,4 @@
# AMR 0.8.0.9024 # AMR 0.8.0.9025
<small>Last updated: 10-Nov-2019</small> <small>Last updated: 10-Nov-2019</small>
### New ### New

6
appveyor.yml
View File

@ -19,12 +19,10 @@
# Visit our website for more info: https://msberends.gitlab.io/AMR. # # Visit our website for more info: https://msberends.gitlab.io/AMR. #
# ==================================================================== # # ==================================================================== #
# Download script file from GitHub
init: init:
ps: | ps: |
$ErrorActionPreference = "Stop" $ErrorActionPreference = "Stop"
Invoke-WebRequest https://gitlab.com/msberends/AMR/raw/master/tests/appveyor/appveyor_tool.ps1 -OutFile "..\appveyor-tool.ps1" Import-Module 'tests\appveyor\appveyor_tool.ps1'
Import-Module '..\appveyor-tool.ps1'
install: install:
ps: Bootstrap ps: Bootstrap
@ -44,7 +42,7 @@ environment:
matrix: matrix:
- R_VERSION: oldrel - R_VERSION: oldrel
- R_VERSION: release - 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: matrix:
allow_failures: allow_failures:

2
docs/404.html
View File

@ -84,7 +84,7 @@
</button> </button>
<span class="navbar-brand"> <span class="navbar-brand">
<a class="navbar-link" href="https://msberends.gitlab.io/AMR/index.html">AMR (for R)</a> <a class="navbar-link" href="https://msberends.gitlab.io/AMR/index.html">AMR (for R)</a>
<span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Latest development version">0.8.0.9024</span> <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Latest development version">0.8.0.9025</span>
</span> </span>
</div> </div>

2
docs/LICENSE-text.html
View File

@ -84,7 +84,7 @@
</button> </button>
<span class="navbar-brand"> <span class="navbar-brand">
<a class="navbar-link" href="index.html">AMR (for R)</a> <a class="navbar-link" href="index.html">AMR (for R)</a>
<span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Latest development version">0.8.0.9024</span> <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Latest development version">0.8.0.9025</span>
</span> </span>
</div> </div>

2
docs/articles/index.html
View File

@ -84,7 +84,7 @@
</button> </button>
<span class="navbar-brand"> <span class="navbar-brand">
<a class="navbar-link" href="../index.html">AMR (for R)</a> <a class="navbar-link" href="../index.html">AMR (for R)</a>
<span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Latest development version">0.8.0.9024</span> <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Latest development version">0.8.0.9025</span>
</span> </span>
</div> </div>

2
docs/authors.html
View File

@ -84,7 +84,7 @@
</button> </button>
<span class="navbar-brand"> <span class="navbar-brand">
<a class="navbar-link" href="index.html">AMR (for R)</a> <a class="navbar-link" href="index.html">AMR (for R)</a>
<span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Latest development version">0.8.0.9024</span> <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Latest development version">0.8.0.9025</span>
</span> </span>
</div> </div>

2
docs/index.html
View File

@ -45,7 +45,7 @@
</button> </button>
<span class="navbar-brand"> <span class="navbar-brand">
<a class="navbar-link" href="index.html">AMR (for R)</a> <a class="navbar-link" href="index.html">AMR (for R)</a>
<span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Latest development version">0.8.0.9024</span> <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Latest development version">0.8.0.9025</span>
</span> </span>
</div> </div>

8
docs/news/index.html
View File

@ -84,7 +84,7 @@
</button> </button>
<span class="navbar-brand"> <span class="navbar-brand">
<a class="navbar-link" href="../index.html">AMR (for R)</a> <a class="navbar-link" href="../index.html">AMR (for R)</a>
<span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Latest development version">0.8.0.9024</span> <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Latest development version">0.8.0.9025</span>
</span> </span>
</div> </div>
@ -231,9 +231,9 @@
</div> </div>
<div id="amr-0-8-0-9024" class="section level1"> <div id="amr-0-8-0-9025" class="section level1">
<h1 class="page-header"> <h1 class="page-header">
<a href="#amr-0-8-0-9024" class="anchor"></a>AMR 0.8.0.9024<small> Unreleased </small> <a href="#amr-0-8-0-9025" class="anchor"></a>AMR 0.8.0.9025<small> Unreleased </small>
</h1> </h1>
<p><small>Last updated: 10-Nov-2019</small></p> <p><small>Last updated: 10-Nov-2019</small></p>
<div id="new" class="section level3"> <div id="new" class="section level3">
@ -1333,7 +1333,7 @@ Using <code><a href="../reference/as.mo.html">as.mo(..., allow_uncertain = 3)</a
<div id="tocnav"> <div id="tocnav">
<h2>Contents</h2> <h2>Contents</h2>
<ul class="nav nav-pills nav-stacked"> <ul class="nav nav-pills nav-stacked">
<li><a href="#amr-0-8-0-9024">0.8.0.9024</a></li> <li><a href="#amr-0-8-0-9025">0.8.0.9025</a></li>
<li><a href="#amr-0-8-0">0.8.0</a></li> <li><a href="#amr-0-8-0">0.8.0</a></li>
<li><a href="#amr-0-7-1">0.7.1</a></li> <li><a href="#amr-0-7-1">0.7.1</a></li>
<li><a href="#amr-0-7-0">0.7.0</a></li> <li><a href="#amr-0-7-0">0.7.0</a></li>

2
docs/reference/index.html
View File

@ -84,7 +84,7 @@
</button> </button>
<span class="navbar-brand"> <span class="navbar-brand">
<a class="navbar-link" href="../index.html">AMR (for R)</a> <a class="navbar-link" href="../index.html">AMR (for R)</a>
<span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Latest development version">0.8.0.9024</span> <span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Latest development version">0.8.0.9025</span>
</span> </span>
</div> </div>

4
tests/appveyor/appveyor_tool.ps1
View File

@ -172,7 +172,9 @@ Function Bootstrap {
} }
Progress "Downloading and installing travis_tool.sh" 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 echo '@bash.exe ../travis_tool.sh %*' | Out-File -Encoding ASCII .\travis_tool.sh.cmd
cat .\travis_tool.sh.cmd cat .\travis_tool.sh.cmd
bash -c "( echo; echo '^travis_tool\.sh\.cmd$' ) >> .Rbuildignore" bash -c "( echo; echo '^travis_tool\.sh\.cmd$' ) >> .Rbuildignore"

6
tests/appveyor/travis_tool.sh
View File

@ -148,8 +148,6 @@ BootstrapMacOptions() {
} }
EnsureDevtools() { EnsureDevtools() {
# force install Rcpp
RBinaryInstall Rcpp
if ! Rscript -e 'if (!("devtools" %in% rownames(installed.packages()))) q(status=1)' ; then if ! Rscript -e 'if (!("devtools" %in% rownames(installed.packages()))) q(status=1)' ; then
# Install devtools and testthat. # Install devtools and testthat.
RBinaryInstall devtools testthat RBinaryInstall devtools testthat
@ -157,6 +155,10 @@ EnsureDevtools() {
} }
EnsureRemotes() { 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 if ! Rscript -e 'if (!("remotes" %in% rownames(installed.packages()))) q(status=1)' ; then
# Install remotes. # Install remotes.
RBinaryInstall remotes RBinaryInstall remotes