minor cleanup

Author: jameslamb

.appveyor.yml

@@ -13,13 +13,14 @@ branches:
 
 environment:
   matrix:
-    - TASK: r-package
-      R_VERSION: 4.0
-      COMPILER: MINGW
-      TOOLCHAIN: MSYS
-    - TASK: r-package
+    - COMPILER: MINGW
+      TASK: r-package
+      R_VERSION: 3.6
+      TOOLCHAIN: MINGW
+    - COMPILER: MSVC 
+      TASK: r-package
       R_VERSION: 4.0
-      COMPILER: MSVC
+      TOOLCHAIN: MSVC
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
     - COMPILER: MSVC
       TASK: python

.ci/test_r_package_windows.ps1

@@ -51,7 +51,7 @@ if ($env:R_MAJOR_VERSION -eq "3") {
   $env:RTOOLS_EXE_FILE = "rtools40-x86_64.exe"
   $env:R_WINDOWS_VERSION = "4.0.0"
 } else {
-  Write-Output "Unrecognized R version: $env:R_VERSION"
+  Write-Output "[ERROR] Unrecognized R version: $env:R_VERSION"
   Check-Output $false
 }
 
@@ -72,6 +72,10 @@ if ($env:TOOLCHAIN -eq "MINGW") {
   Write-Output "Telling R to use MSYS"
   $install_libs = "$env:BUILD_SOURCESDIRECTORY/R-package/src/install.libs.R"
   ((Get-Content -Path $install_libs -Raw) -Replace 'use_msys2 <- FALSE','use_msys2 <- TRUE') | Set-Content -Path $install_libs
+} elseif ($env:TOOLCHAIN -eq "MSVC") {
+  # no customization for MSVC
+} else {
+  Write-Output "[ERROR] Unrecognized coompiler: $env:TOOLCHAIN"
 }
 
 # download R and RTools

.github/workflows/main.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   test:
-    name: ${{ matrix.task }} (${{ matrix.os }}, ${{ matrix.compiler }})
+    name: ${{ matrix.task }} (${{ matrix.os }}, ${{ matrix.compiler }}, R ${{ matrix.r_version }})
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false

.vsts-ci.yml

@@ -115,11 +115,12 @@ jobs:
         TASK: r-package
         COMPILER: MSVC
         R_VERSION: 3.6
+        TOOLCHAIN: MSVC
       r_package_mingw:
         TASK: r-package
         COMPILER: MINGW
-        TOOLCHAIN: MINGW
-        R_VERSION: 3.6
+        R_VERSION: 4.0
+        TOOLCHAIN: MSYS
       regular:
         TASK: regular
         PYTHON_VERSION: 3.6