From 0fd0f74508e1b6d26605a85066e18a4d00a02d84 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Mon, 12 Aug 2019 18:56:01 +0900
Subject: [PATCH] Try to merge windows 2016 and 2019

---
 .github/workflows/windows-2019.yml            | 35 -------------------
 .../{windows-2016.yml => windows.yml}         | 17 ++++++---
 2 files changed, 13 insertions(+), 39 deletions(-)
 delete mode 100644 .github/workflows/windows-2019.yml
 rename .github/workflows/{windows-2016.yml => windows.yml} (65%)

diff --git a/.github/workflows/windows-2019.yml b/.github/workflows/windows-2019.yml
deleted file mode 100644
index c1cea4bc51..0000000000
--- a/.github/workflows/windows-2019.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-name: windows-2019
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - '*'
-jobs:
-  latest:
-    runs-on: windows-2019
-    steps:
-      - name: Install libraries with vcpkg
-        run: |
-          vcpkg --triplet x64-windows install %dependencies% || (
-            sleep 4 && vcpkg --triplet x64-windows install %dependencies%
-          ) || (
-            sleep 25 && vcpkg --triplet x64-windows install %dependencies%
-          )
-        env:
-          dependencies: openssl readline zlib
-      - name: Install libraries with chocolatey
-        run: choco install winflexbison3
-      - name: Checkout # not using actions/checkout because it's unstable.
-        run: git clone --depth=50 https://github.com/ruby/ruby .
-      - name: configure
-        run: |
-          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
-          win32/configure.bat --without-ext=+,dbm,gdbm --enable-bundled-libffi --with-opt-dir=C:/vcpkg/installed/x64-windows
-      - name: nmake
-        run: |
-          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
-          set YACC=win_bison
-          nmake up
-          nmake
diff --git a/.github/workflows/windows-2016.yml b/.github/workflows/windows.yml
similarity index 65%
rename from .github/workflows/windows-2016.yml
rename to .github/workflows/windows.yml
index e211641c02..665d33a0e6 100644
--- a/.github/workflows/windows-2016.yml
+++ b/.github/workflows/windows.yml
@@ -1,4 +1,4 @@
-name: windows-2016
+name: windows
 on:
   push:
     branches:
@@ -8,7 +8,16 @@ on:
       - '*'
 jobs:
   latest:
-    runs-on: windows-2016
+    strategy:
+      matrix:
+        os: [windows-2016, windows-2019]
+        vs: [2017, 2019]
+        exclude:
+          - os: windows-2016
+            vs: 2019
+          - os: windows-2019
+            vs: 2017
+    runs-on: ${{ matrix.os }}
     steps:
       - name: Install libraries with vcpkg
         run: |
@@ -25,11 +34,11 @@ jobs:
         run: git clone --depth=50 https://github.com/ruby/ruby .
       - name: configure
         run: |
-          call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+          call "C:\Program Files (x86)\Microsoft Visual Studio\${{ matrix.vs }}\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
           win32/configure.bat --without-ext=+,dbm,gdbm --enable-bundled-libffi --with-opt-dir=C:/vcpkg/installed/x64-windows
       - name: nmake
         run: |
-          call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+          call "C:\Program Files (x86)\Microsoft Visual Studio\${{ matrix.vs }}\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
           set YACC=win_bison
           nmake up
           nmake