From c12a03b4f096289ae11d98410eb58bad6a7b0e11 Mon Sep 17 00:00:00 2001 From: Alex Peters <80283343+alexpeters1208@users.noreply.github.com> Date: Mon, 8 Jul 2024 12:46:05 -0500 Subject: [PATCH 1/3] Test change to fix R CI, probably will not work --- R/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/build.gradle b/R/build.gradle index 85583260473..101f19e0361 100644 --- a/R/build.gradle +++ b/R/build.gradle @@ -179,7 +179,7 @@ def rClientSite = Docker.registerDockerTask(project, 'rClientSite') { runCommand("mkdir -p ${prefix}/src/rdeephaven/docs") runCommand('''echo "status = tryCatch(" \ " {" \ - " install.packages('pkgdown', repos='https://cran.r-project.org'); " \ + " install.packages('pkgdown', version='2.0.0', repos='https://cran.r-project.org'); " \ " 0" \ " }," \ " error=function(e) 1," \ From 4579c6870a9d08bc2ac8ce0dd9ee328c7ef8b652 Mon Sep 17 00:00:00 2001 From: Alex Peters <80283343+alexpeters1208@users.noreply.github.com> Date: Mon, 8 Jul 2024 13:16:05 -0500 Subject: [PATCH 2/3] Add sessionInfo call to test pkgdown version --- R/r-site.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/R/r-site.sh b/R/r-site.sh index 8eb9e89e25f..2f50e956785 100755 --- a/R/r-site.sh +++ b/R/r-site.sh @@ -13,6 +13,7 @@ cd $DH_PREFIX/src/rdeephaven R --no-save --no-restore < Date: Mon, 8 Jul 2024 19:42:16 +0000 Subject: [PATCH 3/3] Use devtools to downgrade pkgdown as tmp fix --- R/build.gradle | 5 ++++- R/r-site.sh | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/R/build.gradle b/R/build.gradle index 101f19e0361..68d1b704599 100644 --- a/R/build.gradle +++ b/R/build.gradle @@ -179,7 +179,10 @@ def rClientSite = Docker.registerDockerTask(project, 'rClientSite') { runCommand("mkdir -p ${prefix}/src/rdeephaven/docs") runCommand('''echo "status = tryCatch(" \ " {" \ - " install.packages('pkgdown', version='2.0.0', repos='https://cran.r-project.org'); " \ + " install.packages('devtools'); " \ + " require(devtools); " \ + " remove.packages('pkgdown'); " \ + " devtools::install_version('pkgdown', version='2.0.0', repos='https://cran.r-project.org'); " \ " 0" \ " }," \ " error=function(e) 1," \ diff --git a/R/r-site.sh b/R/r-site.sh index 2f50e956785..8eb9e89e25f 100755 --- a/R/r-site.sh +++ b/R/r-site.sh @@ -13,7 +13,6 @@ cd $DH_PREFIX/src/rdeephaven R --no-save --no-restore <