Gradle tasks and script for building docsite

deephaven · Nov 14, 2023 · b0efbbe · b0efbbe
1 parent 968bb16
commit b0efbbe
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 2 deletions.
diff --git a/R/build.gradle b/R/build.gradle
@@ -42,6 +42,7 @@ def buildRClient = Docker.registerDockerTask(project, 'rClient') {
             include 'rdeephaven/R/**'
             include 'rdeephaven/src/*.cpp'
             include 'rdeephaven/src/Makevars'
+            include 'rdeephaven/vignettes/*.Rmd'
         }
     }
     dockerfile {
@@ -64,6 +65,7 @@ def buildRClient = Docker.registerDockerTask(project, 'rClient') {
         copyFile('rdeephaven/R/', "${prefix}/src/rdeephaven/R/")
         copyFile('rdeephaven/src/*.cpp', "${prefix}/src/rdeephaven/src/")
         copyFile('rdeephaven/src/Makevars', "${prefix}/src/rdeephaven/src/")
+        copyFile('rdeephaven/vignettes/*.Rmd', "${prefix}/src/rdeephaven/vignettes/")
         copyFile('r-build.sh', "${prefix}/bin/rdeephaven")
         runCommand("PREFIX=${prefix}; " +
                   '''set -eux ; \
@@ -155,5 +157,43 @@ def rClientDoc = Docker.registerDockerTask(project, 'rClientDoc') {
     containerOutPath = "${prefix}/src/rdeephaven/man"
 }
 
+def rClientSite = Docker.registerDockerTask(project, 'rClientSite') {
+    // Only tested on x86-64, and we only build dependencies for x86-64
+    platform = 'linux/amd64'
+    copyIn {
+        from(layout.projectDirectory) {
+            include 'r-site.sh'
+            include 'rdeephaven/man/**'
+        }
+    }
+    copyOut {
+        into layout.projectDirectory.dir('rdeephaven/docs')
+    }
+    dockerfile {
+        from('deephaven/r-client-doc:local-build')
+        // We need the contents of 'man' to build the docsite
+        copyFile('rdeephaven/man/**', "${prefix}/src/rdeephaven/man/")
+        runCommand("mkdir -p ${prefix}/src/rdeephaven/docs")
+        runCommand('''echo "status = tryCatch(" \
+                           "   {" \
+                           "      install.packages('pkgdown', repos='http://cran.us.r-project.org'); " \
+                           "      0" \
+                           "   }," \
+                           "  error=function(e) 1," \
+                           "  warning=function(w) 2" \
+                           ");" \
+                           "print(paste0('status=', status));" \
+                           "quit(save='no', status=status)" | \
+                        MAKE="make -j`getconf _NPROCESSORS_ONLN`" R --no-save --no-restore
+                   ''')
+        // Keep this after the package installs above;
+        // it is likely it changes more frequently.
+        copyFile('r-site.sh', "${prefix}/bin/rdeephaven")
+    }
+    parentContainers = [ project.tasks.getByName('rClientDoc') ]
+    entrypoint = ["${prefix}/bin/rdeephaven/r-site.sh"]
+    containerOutPath = "${prefix}/src/rdeephaven/docs"
+}
+
 deephavenDocker.shouldLogIfTaskFails testRClient
 tasks.check.dependsOn(testRClient)
diff --git a/R/r-build.sh b/R/r-build.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+echo "HELLO THERE"
+
 set -euo pipefail
 
 for var in DHCPP NCPUS LD_LIBRARY_PATH; do
@@ -20,6 +22,7 @@ rm -f src/*.o src/*.so
 
 MAKE="make -j${NCPUS}"
 cd .. && \
+  rm -f rdeephaven_*.tar.gz && \
   R CMD build rdeephaven && \
   R CMD INSTALL --no-multiarch --with-keep.source rdeephaven_*.tar.gz && \
   rm -f rdeephaven_*.tar.gz && \

diff --git a/R/r-site.sh b/R/r-site.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+set -euo pipefail
+
+if [ -z "${DH_PREFIX}" ]; then
+    echo "$0: Environment variable DH_PREFIX is not set, aborting." 1>&2
+    exit 1
+fi
+
+source $DH_PREFIX/env.sh
+
+cd $DH_PREFIX/src/rdeephaven
+
+R --no-save --no-restore <<EOF
+library('pkgdown')
+status = tryCatch(
+  {
+     print("hello!")
+     pkgdown::build_site()
+     0
+  },
+  error=function(e) 1
+)
+print(paste0('status=', status))
+quit(save='no', status=status)
+EOF
diff --git a/docker/registry/cpp-clients-multi-base/gradle.properties b/docker/registry/cpp-clients-multi-base/gradle.properties
@@ -1,4 +1,4 @@
 io.deephaven.project.ProjectType=DOCKER_REGISTRY
-deephaven.registry.imageName=ghcr.io/deephaven/cpp-clients-multi-base:latest
-deephaven.registry.imageId=ghcr.io/deephaven/cpp-clients-multi-base@sha256:ea81ee9c948f569d0f278ac40c49ad5a520ae0fe0fcc43ed2959dd43a37ccd9f
+deephaven.registry.imageName=alexpeters/cpp-clients-multi-base:local-build
+deephaven.registry.imageId=alexpeters/cpp-clients-multi-base:local-build
 deephaven.registry.platform=linux/amd64