Merge branch 'deephaven:main' into docs-ci-version-improvements

deephaven · Nov 21, 2023 · 26caa91 · 26caa91
2 parents 5fcca2f + 18c6e75
commit 26caa91
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/R/build.gradle b/R/build.gradle
@@ -164,6 +164,7 @@ def rClientSite = Docker.registerDockerTask(project, 'rClientSite') {
         from(layout.projectDirectory) {
             include 'r-site.sh'
             include 'rdeephaven/man/**'
+            include 'rdeephaven/pkgdown/**'
         }
     }
     copyOut {
@@ -173,6 +174,7 @@ def rClientSite = Docker.registerDockerTask(project, 'rClientSite') {
         from('deephaven/r-client-doc:local-build')
         // We need the contents of 'man' to build the docsite
         copyFile('rdeephaven/man/**', "${prefix}/src/rdeephaven/man/")
+        copyFile('rdeephaven/pkgdown/**', "${prefix}/src/rdeephaven/pkgdown/")
         runCommand("mkdir -p ${prefix}/src/rdeephaven/docs")
         runCommand('''echo "status = tryCatch(" \
                            "   {" \

diff --git a/R/r-site.sh b/R/r-site.sh
@@ -15,7 +15,7 @@ R --no-save --no-restore <<EOF
 library('pkgdown')
 status = tryCatch(
   {
-     pkgdown::build_site()
+     pkgdown::build_site(preview=FALSE)
      0
   },
   error=function(e) 1

diff --git a/web/client-ui/Dockerfile b/web/client-ui/Dockerfile
@@ -2,9 +2,9 @@ FROM deephaven/node:local-build
 WORKDIR /usr/src/app
 
 # Most of the time, these versions are the same, except in cases where a patch only affects one of the packages
-ARG WEB_VERSION=0.54.0
-ARG GRID_VERSION=0.54.0
-ARG CHART_VERSION=0.54.0
+ARG WEB_VERSION=0.55.0
+ARG GRID_VERSION=0.55.0
+ARG CHART_VERSION=0.55.0
 
 # Pull in the published code-studio package from npmjs and extract is
 RUN set -eux; \