11876: Pin R deps that are installed from gitub.

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

diff --git a/build/run-tests.sh b/build/run-tests.sh
index 520d3e89d3c5c1a37103371510f22155284fcf90..48b3eab38ac864ab0c66d4a40d17502f60d4cdb3 100755 (executable)
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -781,19 +781,7 @@ do_install sdk/ruby ruby_sdk
 
 install_R_sdk() {
     cd "$WORKSPACE/sdk/R" \
-       && R --quiet --vanilla <<EOF
-options(repos=structure(c(CRAN="http://cran.wustl.edu/")))
-if (!requireNamespace("devtools")) {
-  install.packages("devtools")
-}
-if (!requireNamespace("roxygen2")) {
-  install.packages("roxygen2")
-}
-if (!requireNamespace("pkgdown")) {
-  devtools::install_github("hadley/pkgdown")
-}
-devtools::install_dev_deps()
-EOF
+       && R --quiet --vanilla --file=install_deps.R
 }
 do_install sdk/R R_sdk
 

diff --git a/sdk/R/install_deps.R b/sdk/R/install_deps.R
new file mode 100644 (file)
index 0000000..a54a9a2
--- /dev/null
+++ b/sdk/R/install_deps.R
@@ -0,0 +1,18 @@
+options(repos=structure(c(CRAN="http://cran.wustl.edu/")))
+if (!requireNamespace("devtools")) {
+  install.packages("devtools")
+}
+if (!requireNamespace("roxygen2")) {
+  install.packages("roxygen2")
+}
+
+# These install from github so install known-good versions instead of
+# letting any push to master break our build.
+if (!requireNamespace("pkgload")) {
+  devtools::install_github("r-lib/pkgload", ref="7a97de62adf1793c03e73095937e4655baad79c9")
+}
+if (!requireNamespace("pkgdown")) {
+  devtools::install_github("r-lib/pkgdown", ref="897ffbc016549c11c4263cb5d1f6e9f5c99efb45")
+}
+
+devtools::install_dev_deps()

diff --git a/tools/arvbox/lib/arvbox/docker/service/doc/run-service b/tools/arvbox/lib/arvbox/docker/service/doc/run-service
index 97cc79d32fd2d110f6bd879441316cdcfec6adc1..183ff2abfd5e4e162c5b0102c298991adeb33cdf 100755 (executable)
--- a/tools/arvbox/lib/arvbox/docker/service/doc/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/doc/run-service
@@ -12,19 +12,7 @@ cd /usr/src/arvados/doc
 run_bundler --without=development
 
 cd /usr/src/arvados/sdk/R
-R --quiet --vanilla <<EOF
-options(repos=structure(c(CRAN="http://cran.wustl.edu/")))
-if (!requireNamespace("devtools")) {
-  install.packages("devtools")
-}
-if (!requireNamespace("roxygen2")) {
-  install.packages("roxygen2")
-}
-if (!requireNamespace("pkgdown")) {
-  devtools::install_github("hadley/pkgdown")
-}
-devtools::install_dev_deps()
-EOF
+R --quiet --vanilla --file=install_deps.R
 
 if test "$1" = "--only-deps" ; then
     exit