1
0
mirror of https://github.com/msberends/AMR.git synced 2025-07-11 12:22:01 +02:00

(v0.8.0.9025) appveyor fix

This commit is contained in:
2019-11-10 09:21:43 +01:00
parent 07f945de53
commit a8c48cb2d7
12 changed files with 21 additions and 19 deletions

View File

@ -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"

View File

@ -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