From 688d807cae159a5fc965032098f7bf8066a4ffc3 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Sat, 15 Aug 2020 15:59:11 -0500 Subject: [PATCH 1/3] [ci] Test 32-bit builds for R package --- .ci/test_r_package_windows.ps1 | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.ci/test_r_package_windows.ps1 b/.ci/test_r_package_windows.ps1 index f7f233a9d6c2..04ed1b062c07 100644 --- a/.ci/test_r_package_windows.ps1 +++ b/.ci/test_r_package_windows.ps1 @@ -158,8 +158,14 @@ if ($env:COMPILER -ne "MSVC") { cd "C:\$R_CMD_CHECK_DIR\" } - Write-Output "Running R CMD check as CRAN" - Run-R-Code-Redirect-Stderr "result <- processx::run(command = 'R.exe', args = c('CMD', 'check', '--no-multiarch', '--as-cran', '--run-dontrun', '$PKG_FILE_NAME'), echo = TRUE, windows_verbatim_args = FALSE)" ; $check_succeeded = $? + Write-Output "Running R CMD check" + if ($env:R_BUILD_TYPE -eq "cran") { + # CRAN packages must pass without --no-multiarch (build on 64-bit and 32-bit) + $check_args = "c('CMD', 'check', '--as-cran', '--run-dontrun', '$PKG_FILE_NAME')" + } else { + $check_args = "c('CMD', 'check', '--no-multiarch', '--as-cran', '--run-dontrun', '$PKG_FILE_NAME')" + } + Run-R-Code-Redirect-Stderr "result <- processx::run(command = 'R.exe', args = $check_args, echo = TRUE, windows_verbatim_args = FALSE)" ; $check_succeeded = $? Write-Output "R CMD check build logs:" $INSTALL_LOG_FILE_NAME = "lightgbm.Rcheck\00install.out" From 265b251f529113837b5b32f761433e353fdd16c8 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Sat, 15 Aug 2020 16:01:11 -0500 Subject: [PATCH 2/3] update README --- R-package/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R-package/README.md b/R-package/README.md index cfae8643fc8c..689a77ebc9de 100644 --- a/R-package/README.md +++ b/R-package/README.md @@ -26,7 +26,7 @@ To install this package on any operating system: ```r PKG_URL <- "https://github.com/microsoft/LightGBM/releases/download/v3.0.0rc1/lightgbm-3.0.0-1-r-cran.tar.gz" -remotes::install_url(PKG_URL, INSTALL_OPTS = "--no-multiarch") +remotes::install_url(PKG_URL) ``` ### Installing Precompiled Binaries From 35cd050643f5d6d77869e5aa43661a4565d9a60b Mon Sep 17 00:00:00 2001 From: James Lamb Date: Sun, 16 Aug 2020 11:29:01 -0500 Subject: [PATCH 3/3] empty commit