This is an automated email from the ASF dual-hosted git repository.
paleolimbot pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-nanoarrow.git
The following commit(s) were added to refs/heads/main by this push:
new aebc8124 chore(dev/release): Do nanoarrow vendoring using R_BIN
instead of R CMD INSTALL on Windows (#475)
aebc8124 is described below
commit aebc81248c0423a535640498e3f26a6de69e7eca
Author: Dewey Dunnington <[email protected]>
AuthorDate: Fri May 17 14:47:10 2024 -0300
chore(dev/release): Do nanoarrow vendoring using R_BIN instead of R CMD
INSTALL on Windows (#475)
It seems that running R CMD INSTALL is not sufficient on Windows to
vendor the proper files. It may have worked by accident in the past
because the vendored files already existed in my local checkout. I don't
think there are many people verifying on Windows; however I think
removing `configure.win` (since it seems not to run anyway) and
configure on build is a better option.
---
dev/release/verify-release-candidate.sh | 9 +++++----
r/.Rbuildignore | 2 ++
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/dev/release/verify-release-candidate.sh
b/dev/release/verify-release-candidate.sh
index 2c4c8187..690b6363 100755
--- a/dev/release/verify-release-candidate.sh
+++ b/dev/release/verify-release-candidate.sh
@@ -277,11 +277,12 @@ test_r() {
show_info "Build the R package source tarball"
- # Running R CMD INSTALL on the R source directory is the most reliable
cross-platform
- # method to ensure the proper version of nanoarrow is vendored into the R
package.
- # Do this in a temporary library so not to overwrite the a user's existing
package.
+ # Run bootstrap.R from within the r subdirectory
+ pushd r
+ "$R_BIN" -e 'source("bootstrap.R", echo = TRUE)'
+ popd
+
mkdir "$NANOARROW_TMPDIR/tmplib"
- "$R_BIN" CMD INSTALL r --preclean --library="$NANOARROW_TMPDIR/tmplib"
# Builds the R source tarball
pushd $NANOARROW_TMPDIR
diff --git a/r/.Rbuildignore b/r/.Rbuildignore
index 8cbf5e33..a9b36934 100644
--- a/r/.Rbuildignore
+++ b/r/.Rbuildignore
@@ -12,3 +12,5 @@
^bootstrap\.R$
^\.cache$
^compile_commands\.json$
+^configure\.win$
+^configure$
