Merge branch '18102-max-dispatch-attempts'

[arvados.git] / sdk / R / install_deps.R

diff --git a/sdk/R/install_deps.R b/sdk/R/install_deps.R
index a54a9a23facdda1769520e7d653b976c293ce4bd..6c33f97913f83aaeaebf392fec740ba9f9d0d98a 100644 (file)
--- a/sdk/R/install_deps.R
+++ b/sdk/R/install_deps.R
@@ -1,3 +1,7 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
 options(repos=structure(c(CRAN="http://cran.wustl.edu/")))
 if (!requireNamespace("devtools")) {
   install.packages("devtools")
@@ -5,14 +9,17 @@ if (!requireNamespace("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("knitr")) {
+  install.packages("knitr")
+}
+if (!requireNamespace("markdown")) {
+  install.packages("markdown")
 }
-if (!requireNamespace("pkgdown")) {
-  devtools::install_github("r-lib/pkgdown", ref="897ffbc016549c11c4263cb5d1f6e9f5c99efb45")
+if (!requireNamespace("XML")) {
+  # XML 3.99-0.4 depends on R >= 4.0.0, but we run tests on debian
+  # stable (10) with R 3.5.2 so we install an older version from
+  # source.
+  install.packages("https://cran.r-project.org/src/contrib/Archive/XML/XML_3.99-0.3.tar.gz", repos=NULL, type="source")
 }
 
 devtools::install_dev_deps()