build: DH-20847: Fix R client site build and improve error reporting. (#7441)

cpwright · web-flow · commit 17d0a631d58f · 2025-11-24T15:25:50.000-05:00
diff --git a/R/build.gradle b/R/build.gradle
@@ -142,8 +142,7 @@ def rClientDoc = Docker.registerDockerTask(project, 'rClientDoc') {
                            "      install.packages('roxygen2'); " \
                            "      0" \
                            "   }," \
-                           "  error=function(e) 1," \
-                           "  warning=function(w) 2" \
+                           "  error=function(e) { print(paste0('ERROR: ', e)); 1 }" \
                            ");" \
                            "print(paste0('status=', status));" \
                            "quit(save='no', status=status)" | \
@@ -180,11 +179,11 @@ def rClientSite = Docker.registerDockerTask(project, 'rClientSite') {
         runCommand("mkdir -p ${prefix}/src/rdeephaven/docs")
         runCommand('''echo "status = tryCatch(" \
                            "   {" \
-                           "      install.packages('pkgdown'); " \
+                           "      install.packages('remotes'); " \
+                           "      remotes::install_version('pkgdown', version = '2.1.3', repos = 'https://cloud.r-project.org'); " \
                            "      0" \
                            "   }," \
-                           "  error=function(e) 1," \
-                           "  warning=function(w) 2" \
+                           "  error=function(e) { print(paste0('ERROR: ', e)); 1 }" \
                            ");" \
                            "print(paste0('status=', status));" \
                            "quit(save='no', status=status)" | \
diff --git a/R/r-doc.sh b/R/r-doc.sh
@@ -18,7 +18,7 @@ status = tryCatch(
      roxygen2::roxygenize()
      0
   },
-  error=function(e) 1
+  error=function(e) { print(paste0('ERROR: ', e)); 1 }
 )
 print(paste0('status=', status))
 quit(save='no', status=status)
diff --git a/R/r-site.sh b/R/r-site.sh
@@ -18,7 +18,7 @@ status = tryCatch(
      pkgdown::build_site(preview=FALSE)
      0
   },
-  error=function(e) 1
+  error=function(e) { print(paste0('ERROR: ', e)); 1 }
 )
 print(paste0('status=', status))
 quit(save='no', status=status)
diff --git a/R/r-tests.sh b/R/r-tests.sh
@@ -25,7 +25,7 @@ status = tryCatch(
      test_package('rdeephaven', reporter = 'junit')
      0
   },
-  error=function(e) 1
+  error=function(e) { print(paste0('ERROR: ', e)); 1 }
 )
 print(paste0('status=', status))
 quit(save='no', status=status)

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ status = tryCatch(`
`18`	`18`	`roxygen2::roxygenize()`
`19`	`19`	`0`
`20`	`20`	`},`
`21`		`- error=function(e) 1`
	`21`	`+ error=function(e) { print(paste0('ERROR: ', e)); 1 }`
`22`	`22`	`)`
`23`	`23`	`print(paste0('status=', status))`
`24`	`24`	`quit(save='no', status=status)`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ status = tryCatch(`
`25`	`25`	`test_package('rdeephaven', reporter = 'junit')`
`26`	`26`	`0`
`27`	`27`	`},`
`28`		`- error=function(e) 1`
	`28`	`+ error=function(e) { print(paste0('ERROR: ', e)); 1 }`
`29`	`29`	`)`
`30`	`30`	`print(paste0('status=', status))`
`31`	`31`	`quit(save='no', status=status)`