Cleanups

Author: nealrichardson

appveyor.yml

@@ -59,52 +59,52 @@ environment:
   matrix:
     # NOTE: clcache seems to work best with Ninja and worst with msbuild
     # (as generated by cmake)
-    - JOB: "R without libarrow"
-      USE_CLCACHE: false
     - JOB: "Build"
       GENERATOR: Ninja
       CONFIGURATION: "Release"
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-    # - JOB: "Toolchain"
-    #   GENERATOR: Visual Studio 14 2015 Win64
-    #   CONFIGURATION: "Release"
-    #   ARROW_BUILD_FLIGHT: "ON"
-    #   ARROW_BUILD_GANDIVA: "ON"
-    # # NOTE: Since ARROW-5403 we have disabled the static CRT build
-    # # - JOB: "Static_Crt_Build"
-    # #   GENERATOR: Ninja
-    # - JOB: "Build_Debug"
+    - JOB: "Toolchain"
+      GENERATOR: Visual Studio 14 2015 Win64
+      CONFIGURATION: "Release"
+      ARROW_BUILD_FLIGHT: "ON"
+      ARROW_BUILD_GANDIVA: "ON"
+    # NOTE: Since ARROW-5403 we have disabled the static CRT build
+    # - JOB: "Static_Crt_Build"
     #   GENERATOR: Ninja
-    #   CONFIGURATION: "Debug"
-    # - JOB: "MinGW32"
-    #   MINGW_ARCH: i686
-    #   MINGW_PACKAGE_PREFIX: mingw-w64-i686
-    #   MINGW_PREFIX: c:\msys64\mingw32
-    #   MSYSTEM: MINGW32
-    #   USE_CLCACHE: false
-    # - JOB: "MinGW64"
-    #   MINGW_ARCH: x86_64
-    #   MINGW_PACKAGE_PREFIX: mingw-w64-x86_64
-    #   MINGW_PREFIX: c:\msys64\mingw64
-    #   MSYSTEM: MINGW64
-    #   USE_CLCACHE: false
-    # - JOB: "Rust"
-    #   TARGET: x86_64-pc-windows-msvc
-    #   USE_CLCACHE: false
-    # - JOB: "C#"
-    #   APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-    #   USE_CLCACHE: false
-    # - JOB: "Go"
-    #   MINGW_PACKAGE_PREFIX: mingw-w64-x86_64
-    #   MINGW_PREFIX: c:\msys64\mingw64
-    #   MSYSTEM: MINGW64
-    #   USE_CLCACHE: false
-    #   GOROOT: 'c:\go112'
-    #   GOPATH: c:\gopath
-    #   GO111MODULE: on
-    #   GOTOOLDIR: '%GOROOT%\pkg\tool\windows_amd64'
-    #   PATH: '%GOPATH%\bin;%GOROOT%\bin;%PATH%'
-
+    - JOB: "Build_Debug"
+      GENERATOR: Ninja
+      CONFIGURATION: "Debug"
+    - JOB: "MinGW32"
+      MINGW_ARCH: i686
+      MINGW_PACKAGE_PREFIX: mingw-w64-i686
+      MINGW_PREFIX: c:\msys64\mingw32
+      MSYSTEM: MINGW32
+      USE_CLCACHE: false
+    - JOB: "MinGW64"
+      MINGW_ARCH: x86_64
+      MINGW_PACKAGE_PREFIX: mingw-w64-x86_64
+      MINGW_PREFIX: c:\msys64\mingw64
+      MSYSTEM: MINGW64
+      USE_CLCACHE: false
+    - JOB: "Rust"
+      TARGET: x86_64-pc-windows-msvc
+      USE_CLCACHE: false
+    - JOB: "C#"
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      USE_CLCACHE: false
+    - JOB: "Go"
+      MINGW_PACKAGE_PREFIX: mingw-w64-x86_64
+      MINGW_PREFIX: c:\msys64\mingw64
+      MSYSTEM: MINGW64
+      USE_CLCACHE: false
+      GOROOT: 'c:\go112'
+      GOPATH: c:\gopath
+      GO111MODULE: on
+      GOTOOLDIR: '%GOROOT%\pkg\tool\windows_amd64'
+      PATH: '%GOPATH%\bin;%GOROOT%\bin;%PATH%'
+    - JOB: "R without libarrow"
+      USE_CLCACHE: false
+  
   MSVC_DEFAULT_OPTIONS: ON
   APPVEYOR_SAVE_CACHE_ON_ERROR: true
 

ci/appveyor-filter-changes.bat

@@ -43,7 +43,7 @@ if "%JOB%" == "Rust" (
         echo ===
         appveyor exit
     )
-) else if "%JOB%" == "MinGW64 R" (
+) else if "%JOB:~,2%" == "R " (
     if "%ARROW_CI_R_AFFECTED%" == "0" (
         echo ===
         echo === No C++ or R changes, exiting job