Fixed machine list parsing: s/find_first_of/find

.appveyor.yml

@@ -5,10 +5,19 @@ platform: x64
 configuration:  # a trick to construct a build matrix with multiple Python versions
   - 3.7
 
+# only build pull requests and
+# commits to 'master'
+branches:
+  only:
+    - master
+
 environment:
   matrix:
     - COMPILER: MINGW
       TASK: r-package
+    - COMPILER: MSVC
+      TASK: r-package
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
     - COMPILER: MSVC
       TASK: python
     - COMPILER: MINGW

.ci/test_r_package.sh

@@ -82,9 +82,21 @@ export _R_CHECK_FORCE_SUGGESTS_=0
 # fails tests if either ERRORs or WARNINGs are thrown by
 # R CMD CHECK
 check_succeeded="yes"
-R CMD check ${PKG_TARBALL} \
-    --as-cran \
-|| check_succeeded="no"
+(
+    R CMD check ${PKG_TARBALL} \
+        --as-cran \
+    || check_succeeded="no"
+) &
+
+# R CMD check suppresses output, some CIs kill builds after
+# a few minutes with no output. This trick gives R CMD check more time
+#     * https://github.com/travis-ci/travis-ci/issues/4190#issuecomment-169987525
+#     * https://stackoverflow.com/a/29890106/3986677
+CHECK_PID=$!
+while kill -0 ${CHECK_PID} >/dev/null 2>&1; do
+    echo -n -e " \b"
+    sleep 5
+done
 
 echo "R CMD check build logs:"
 cat ${BUILD_DIRECTORY}/lightgbm.Rcheck/00install.out

.ci/test_r_package_windows.ps1

@@ -14,6 +14,7 @@ function Download-File-With-Retries {
 
 $env:R_WINDOWS_VERSION = "3.6.3"
 $env:R_LIB_PATH = "$env:BUILD_SOURCESDIRECTORY/RLibrary" -replace '[\\]', '/'
+$env:R_LIBS = "$env:R_LIB_PATH"
 $env:PATH = "$env:R_LIB_PATH/Rtools/bin;" + "$env:R_LIB_PATH/R/bin/x64;" + "$env:R_LIB_PATH/miktex/texmfs/install/miktex/bin/x64;" + $env:PATH
 $env:CRAN_MIRROR = "https://cloud.r-project.org/"
 $env:CTAN_MIRROR = "https://ctan.math.illinois.edu/systems/win32/miktex/tm/packages/"
@@ -64,45 +65,65 @@ if ($env:COMPILER -eq "MINGW") {
     conda install -q -y --no-deps pandoc
 }
 
-Add-Content .Renviron "R_LIBS=$env:R_LIB_PATH"
-
 Write-Output "Installing dependencies"
-$packages = "c('data.table', 'jsonlite', 'Matrix', 'R6', 'testthat'), dependencies = c('Imports', 'Depends', 'LinkingTo')"
+$packages = "c('data.table', 'jsonlite', 'Matrix', 'processx', 'R6', 'testthat'), dependencies = c('Imports', 'Depends', 'LinkingTo')"
 Rscript --vanilla -e "options(install.packages.check.source = 'no'); install.packages($packages, repos = '$env:CRAN_MIRROR', type = 'binary', lib = '$env:R_LIB_PATH')" ; Check-Output $?
 
 Write-Output "Building R package"
-Rscript build_r.R --skip-install ; Check-Output $?
 
-$PKG_FILE_NAME = Get-Item *.tar.gz
-$LOG_FILE_NAME = "lightgbm.Rcheck/00check.log"
+# R CMD check is not used for MSVC builds
+if ($env:COMPILER -ne "MSVC") {
+  Rscript build_r.R --skip-install ; Check-Output $?
 
-$env:_R_CHECK_FORCE_SUGGESTS_ = 0
-if ($env:COMPILER -ne "MINGW") {
-  Write-Output "Running R CMD check without checking documentation"
-  R.exe CMD check --no-multiarch --no-examples --no-manual --ignore-vignettes ${PKG_FILE_NAME} ; $check_succeeded = $?
-} else {
+  $PKG_FILE_NAME = Get-Item *.tar.gz
+  $LOG_FILE_NAME = "lightgbm.Rcheck/00check.log"
+
+  $env:_R_CHECK_FORCE_SUGGESTS_ = 0
   Write-Output "Running R CMD check as CRAN"
   R.exe CMD check --no-multiarch --as-cran ${PKG_FILE_NAME} ; $check_succeeded = $?
-}
 
-Write-Output "R CMD check build logs:"
-Get-Content -Path $env:BUILD_SOURCESDIRECTORY\lightgbm.Rcheck\00install.out
-
-Check-Output $check_succeeded
+  Write-Output "R CMD check build logs:"
+  $INSTALL_LOG_FILE_NAME = "$env:BUILD_SOURCESDIRECTORY\lightgbm.Rcheck\00install.out"
+  Get-Content -Path "$INSTALL_LOG_FILE_NAME"
+
+  Check-Output $check_succeeded
+
+  Write-Output "Looking for issues with R CMD check results"
+  if (Get-Content "$LOG_FILE_NAME" | Select-String -Pattern "WARNING" -Quiet) {
+      echo "WARNINGS have been found by R CMD check!"
+      Check-Output $False
+  }
+
+  $note_str = Get-Content "${LOG_FILE_NAME}" | Select-String -Pattern ' NOTE' | Out-String ; Check-Output $?
+  $relevant_line = $note_str -match '.*Status: (\d+) NOTE.*'
+  $NUM_CHECK_NOTES = $matches[1]
+  $ALLOWED_CHECK_NOTES = 3
+  if ([int]$NUM_CHECK_NOTES -gt $ALLOWED_CHECK_NOTES) {
+      Write-Output "Found ${NUM_CHECK_NOTES} NOTEs from R CMD check. Only ${ALLOWED_CHECK_NOTES} are allowed"
+      Check-Output $False
+  }
+} else {
+  $INSTALL_LOG_FILE_NAME = "$env:BUILD_SOURCESDIRECTORY\00install_out.txt"
+  Rscript build_r.R *> $INSTALL_LOG_FILE_NAME ; $install_succeeded = $?
+  Write-Output "----- build and install logs -----"
+  Get-Content -Path "$INSTALL_LOG_FILE_NAME"
+  Write-Output "----- end of build and install logs -----"
+  Check-Output $install_succeeded
+}
 
-Write-Output "Looking for issues with R CMD check results"
-if (Get-Content "$LOG_FILE_NAME" | Select-String -Pattern "WARNING" -Quiet) {
-    echo "WARNINGS have been found by R CMD check!"
-    Check-Output $False
+# Checking that we actually got the expected compiler. The R package has some logic
+# to fail back to MinGW if MSVC fails, but for CI builds we need to check that the correct
+# compiler was used.
+$checks = Select-String -Path "${INSTALL_LOG_FILE_NAME}" -Pattern "Check for working CXX compiler.*$env:COMPILER"
+if ($checks.Matches.length -eq 0) {
+  Write-Output "The wrong compiler was used. Check the build logs."
+  Check-Output $False
 }
 
-$note_str = Get-Content "${LOG_FILE_NAME}" | Select-String -Pattern ' NOTE' | Out-String ; Check-Output $?
-$relevant_line = $note_str -match '.*Status: (\d+) NOTE.*'
-$NUM_CHECK_NOTES = $matches[1]
-$ALLOWED_CHECK_NOTES = 3
-if ([int]$NUM_CHECK_NOTES -gt $ALLOWED_CHECK_NOTES) {
-    Write-Output "Found ${NUM_CHECK_NOTES} NOTEs from R CMD check. Only ${ALLOWED_CHECK_NOTES} are allowed"
-    Check-Output $False
+if ($env:COMPILER -eq "MSVC") {
+  Write-Output "Running tests with testthat.R"
+  cd R-package/tests
+  Rscript testthat.R ; Check-Output $?
 }
 
 Write-Output "No issues were found checking the R package"

.gitignore

@@ -397,6 +397,7 @@ python-package/compile/
 python-package/lightgbm/VERSION.txt
 
 # R build artefacts
+R-package/docs
 R-package/src/CMakeLists.txt
 R-package/src/lib_lightgbm.so.dSYM/
 R-package/src/src/

.travis.yml

@@ -8,7 +8,7 @@ os:
   - linux
   - osx
 dist: bionic
-osx_image: xcode11.4
+osx_image: xcode11.5
 
 env:
   global:  # default values

.vsts-ci.yml

@@ -120,7 +120,7 @@ jobs:
     matrix:
       r_package:
         TASK: r-package
-        COMPILER: MINGW
+        COMPILER: MSVC
       regular:
         TASK: regular
         PYTHON_VERSION: 3.6

R-package/DESCRIPTION

@@ -27,6 +27,7 @@ Biarch: false
 Suggests:
     ggplot2 (>= 1.0.1),
     knitr,
+    processx,
     rmarkdown,
     testthat
 Depends:

R-package/R/lightgbm.R

@@ -15,6 +15,7 @@
 #' @param nrounds number of training rounds
 #' @param params List of parameters
 #' @param verbose verbosity for output, if <= 0, also will disable the print of evaluation during training
+#' @keywords internal
 NULL
 
 #' @name lightgbm

R-package/pkgdown/_pkgdown.yml

@@ -6,6 +6,13 @@ site:
   root: ''
   title: LightGBM, Light Gradient Boosting Machine
 
+repo:
+  url:
+    home: https://github.com/microsoft/LightGBM/
+    source: https://github.com/microsoft/LightGBM/tree/master/R-package/
+    issue: https://github.com/microsoft/LightGBM/issues/
+    user: https://github.com/
+
 development:
   mode: unreleased
 
@@ -65,6 +72,7 @@ reference:
     - '`lgb.prepare2`'
     - '`lgb.prepare_rules`'
     - '`lgb.prepare_rules2`'
+    - '`lightgbm`'
     - '`lgb.train`'
     - '`lgb.cv`'
   - title: Saving / Loading Models