Merge pull request #5031 from RoryO/update-ci

Update Windows CI settings

2 files changed, 37 insertions, 42 deletions

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1c6fa34b4..335c0cdf6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -5,51 +5,59 @@ on: [push, pull_request]
 jobs:
   Ubuntu-1604:
     runs-on: ubuntu-16.04
+    env:
+      MRUBY_CONFIG: travis_config.rb
     steps:
     - uses: actions/checkout@v1
     - name: apt
       run: sudo apt install ruby gperf
-    - name: build and test
-      run: rake -m -j4 all test
-      env:
-        MRUBY_CONFIG: travis_config.rb
+    - name: build
+      run: rake -m
+    - name: test
+      run: rake test
 
   Ubuntu-1804-gcc:
     runs-on: ubuntu-18.04
+    env:
+      MRUBY_CONFIG: travis_config.rb
+      CC: gcc
+      CXX: g++
     steps:
     - uses: actions/checkout@v1
     - name: apt
       run: sudo apt install ruby gperf gcc g++
-    - name: build and test
-      run: rake -m -j4 all test
-      env:
-        MRUBY_CONFIG: travis_config.rb
-        CC: gcc
-        CXX: g++
+    - name: build
+      run: rake -m
+    - name: test
+      run: rake test
 
   Ubuntu-1804-clang:
     runs-on: ubuntu-18.04
+    env:
+      MRUBY_CONFIG: travis_config.rb
+      CC: clang
+      CXX: clang++
     steps:
     - uses: actions/checkout@v1
     - name: apt
       run: sudo apt install ruby gperf
-    - name: build and test
-      run: rake -m -j4 all test
-      env:
-        MRUBY_CONFIG: travis_config.rb
-        CC: clang
-        CXX: clang++
+    - name: build
+      run: rake -m
+    - name: test
+      run: rake test
 
   macOS:
     runs-on: macos-latest
+    env:
+      MRUBY_CONFIG: travis_config.rb
     steps:
     - uses: actions/checkout@v1
     - name: brew
       run: brew install ruby gperf
-    - name: build and test
-      run: rake -m -j4 all test
-      env:
-        MRUBY_CONFIG: travis_config.rb
+    - name: build
+      run: rake -m
+    - name: test
+      run: rake test
 
   Windows-MinGW:
     runs-on: windows-latest
@@ -57,8 +65,8 @@ jobs:
     - uses: actions/checkout@v1
     - name: chocolatey
       run: choco install -y ruby gperf
-    - name: build and test
-      run: rake -E '$stdout.sync=true' -j4 test
+    - name: build
+      run: rake -E 'STDOUT.sync=true' test
       env:
         MRUBY_CONFIG: travis_config.rb
         CFLAGS: -g -O1 -Wall -Wundef
@@ -82,22 +90,13 @@ jobs:
     - name: Set ENV
       run: |
         echo '::set-env name=PATH::C:\tools\cygwin\bin;C:\tools\cygwin\usr\bin'
-    - name: build and test
+    - name: build
       shell: cmd
-      run: C:\tools\cygwin\bin\ruby.exe /usr/bin/rake -m -j4 -E 'STDOUT.sync=true' test
+      run: C:\tools\cygwin\bin\ruby.exe /usr/bin/rake -E 'STDOUT.sync=true' -m
       env:
         MRUBY_CONFIG: travis_config.rb
-
-  Windows-VC:
-    runs-on: windows-latest
-    steps:
-    - uses: actions/checkout@v1
-    - name: chocolatey
-      run: choco install -y ruby gperf
-    - name: build and test
+    - name: test
       shell: cmd
-      run: |
-        call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
-        rake -E "STDOUT.sync=true" -m -j4 test
+      run: C:\tools\cygwin\bin\ruby.exe /usr/bin/rake -E 'STDOUT.sync=true' test
       env:
-        MRUBY_CONFIG: appveyor_config.rb
+        MRUBY_CONFIG: travis_config.rb
diff --git a/appveyor.yml b/appveyor.yml
index ac77222d6..93c40dbb1 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -30,11 +30,6 @@ environment:
       appveyor_build_worker_image: Visual Studio 2015
       machine: x86
 
-    - job_name: Visual Studio 2013 64bit
-      visualcpp: C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat
-      appveyor_build_worker_image: Visual Studio 2015
-      machine: x86_amd64
-
 init:
   - call "%visualcpp%" %machine%
   # For using Rubyins4aller's Ruby 2.6 64bit
@@ -45,4 +40,5 @@ init:
 
 build_script:
   - set MRUBY_CONFIG=appveyor_config.rb
-  - rake -E "$stdout.sync=true" -m -j4 test
+  - rake -E "$stdout.sync=true" -m -j4
+  - rake test