trying setting CXX directly

jameslamb · Apr 19, 2020 · c145b7d · c145b7d
1 parent eed30a0
commit c145b7d
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 38 deletions.
diff --git a/.ci/test_r_package_windows.ps1 b/.ci/test_r_package_windows.ps1
@@ -15,10 +15,15 @@ function Download-File-With-Retries {
 $env:R_WINDOWS_VERSION = "3.6.3"
 $env:R_LIB_PATH = "$env:BUILD_SOURCESDIRECTORY/RLibrary" -replace '[\\]', '/'
 Write-Output "R_LIB_PATH: $env:R_LIB_PATH"
-$env:PATH = "$env:R_LIB_PATH/Rtools/mingw_64/bin;" + "$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: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/"
 
+if ($env:COMPILER -eq "MINGW") {
+  $env:CXX = "$env:R_LIB_PATH/Rtools/mingw_64/bin/g++.exe"
+  $env:CC = "$env:R_LIB_PATH/Rtools/mingw_64/bin/gcc.exe"
+}
+
 cd $env:BUILD_SOURCESDIRECTORY
 tzutil /s "GMT Standard Time"
 [Void][System.IO.Directory]::CreateDirectory($env:R_LIB_PATH)
@@ -46,9 +51,9 @@ Write-Output "Installing Rtools"
 Start-Process -FilePath Rtools.exe -NoNewWindow -Wait -ArgumentList "/VERYSILENT /DIR=$env:R_LIB_PATH/Rtools" ; Check-Output $?
 Write-Output "Done installing Rtools"
 
-# MiKTeX and pandoc can be skipped on Azure builds, since we don't
+# MiKTeX and pandoc can be skipped on MINGW builds, since we don't
 # build the package documentation for those
-if ($env:AZURE -ne "true") {
+if ($env:COMPILER -eq "MINGW") {
 
     Write-Output "Downloading MiKTeX"
     Download-File-With-Retries -url "https://miktex.org/download/win/miktexsetup-x64.zip" -destfile "miktexsetup-x64.zip"
@@ -77,7 +82,7 @@ $PKG_FILE_NAME = Get-Item *.tar.gz
 $LOG_FILE_NAME = "lightgbm.Rcheck/00check.log"
 
 $env:_R_CHECK_FORCE_SUGGESTS_=0
-if ($env:AZURE -eq "true") {
+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 {

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
@@ -24,24 +24,24 @@ jobs:
   strategy:
     maxParallel: 6
     matrix:
-      regular:
-        TASK: regular
-      sdist:
-        TASK: sdist
-        PYTHON_VERSION: 3.5
-      bdist:
-        TASK: bdist
-        PYTHON_VERSION: 3.7
-      inference:
-        TASK: if-else
-      mpi_source:
-        TASK: mpi
-        METHOD: source
-        PYTHON_VERSION: 2.7
-      gpu_source:
-        TASK: gpu
-        METHOD: source
-        PYTHON_VERSION: 3.6
+      # regular:
+      #   TASK: regular
+      # sdist:
+      #   TASK: sdist
+      #   PYTHON_VERSION: 3.5
+      # bdist:
+      #   TASK: bdist
+      #   PYTHON_VERSION: 3.7
+      # inference:
+      #   TASK: if-else
+      # mpi_source:
+      #   TASK: mpi
+      #   METHOD: source
+      #   PYTHON_VERSION: 2.7
+      # gpu_source:
+      #   TASK: gpu
+      #   METHOD: source
+      #   PYTHON_VERSION: 3.6
       r_package:
         TASK: r-package
   steps:
@@ -78,14 +78,14 @@ jobs:
   strategy:
     maxParallel: 3
     matrix:
-      regular:
-        TASK: regular
-        PYTHON_VERSION: 3.7
-      sdist:
-        TASK: sdist
-        PYTHON_VERSION: 3.5
-      bdist:
-        TASK: bdist
+      # regular:
+      #   TASK: regular
+      #   PYTHON_VERSION: 3.7
+      # sdist:
+      #   TASK: sdist
+      #   PYTHON_VERSION: 3.5
+      # bdist:
+      #   TASK: bdist
       r_package:
         TASK: r-package
   steps:
@@ -122,14 +122,14 @@ jobs:
       r_package:
         TASK: r-package
         COMPILER: MINGW
-      regular:
-        TASK: regular
-        PYTHON_VERSION: 3.6
-      sdist:
-        TASK: sdist
-        PYTHON_VERSION: 2.7
-      bdist:
-        TASK: bdist
+      # regular:
+      #   TASK: regular
+      #   PYTHON_VERSION: 3.6
+      # sdist:
+      #   TASK: sdist
+      #   PYTHON_VERSION: 2.7
+      # bdist:
+      #   TASK: bdist
   steps:
   - powershell: |
       Write-Host "##vso[task.prependpath]$env:CONDA\Scripts"