https://git.ruby-lang.org/ruby.git/commit/?id=0fd0f74508

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


diff --git a/.github/workflows/windows-2016.yml b/.github/workflows/windows-2016.yml
deleted file mode 100644
index e211641..0000000
--- a/.github/workflows/windows-2016.yml
+++ /dev/null
@@ -1,35 +0,0 @@ https://github.com/ruby/ruby/blob/trunk/#L0
-name: windows-2016
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - '*'
-jobs:
-  latest:
-    runs-on: windows-2016
-    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\2017\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"
-          set YACC=win_bison
-          nmake up
-          nmake
diff --git a/.github/workflows/windows-2019.yml b/.github/workflows/windows-2019.yml
deleted file mode 100644
index c1cea4b..0000000
--- a/.github/workflows/windows-2019.yml
+++ /dev/null
@@ -1,35 +0,0 @@ https://github.com/ruby/ruby/blob/trunk/#L0
-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.yml b/.github/workflows/windows.yml
new file mode 100644
index 0000000..665d33a
--- /dev/null
+++ b/.github/workflows/windows.yml
@@ -0,0 +1,44 @@ https://github.com/ruby/ruby/blob/trunk/.github/workflows/windows.yml#L1
+name: windows
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - '*'
+jobs:
+  latest:
+    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: |
+          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\${{ 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\${{ matrix.vs }}\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+          set YACC=win_bison
+          nmake up
+          nmake
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/