From 2123c6ac0772b83005d50768784d47c515768b09 Mon Sep 17 00:00:00 2001
From: Kazuki Yamaguchi <k@rhe.jp>
Date: Wed, 26 Feb 2020 10:10:41 +0900
Subject: .github/workflows: merge CI jobs into a single workflow

The "Ubuntu-macOS" and "Windows" workflows are both for the same
purpose. Merge them into a single workflow for clarity.
---
 .github/workflows/test.yml         | 73 ++++++++++++++++++++++++++++++++++++++
 .github/workflows/ubuntu-macos.yml | 33 -----------------
 .github/workflows/windows.yml      | 47 ------------------------
 3 files changed, 73 insertions(+), 80 deletions(-)
 create mode 100644 .github/workflows/test.yml
 delete mode 100644 .github/workflows/ubuntu-macos.yml
 delete mode 100644 .github/workflows/windows.yml

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 00000000..6d72e4d2
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,73 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    name: >-
+      ${{ matrix.os }} ${{ matrix.ruby }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ ubuntu-latest, macos-latest ]
+        ruby: [ head, 2.7, 2.6, 2.5, 2.4, 2.3 ]
+    steps:
+      - name: repo checkout
+        uses: actions/checkout@v2
+
+      - name: load ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+
+      - name: depends
+        run:  rake install_dependencies
+
+      - name: compile
+        run:  rake compile -- --enable-debug
+
+      - name: test
+        run:  rake test TESTOPTS="-v --no-show-detail-immediately" OSSL_MDEBUG=1
+
+  test-windows:
+    name: >-
+      ${{ matrix.os }} ${{ matrix.ruby }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ windows-latest ]
+        ruby: [ mswin, mingw, 2.7, 2.6, 2.5, 2.4, 2.3 ]
+    steps:
+      - name: repo checkout
+        uses: actions/checkout@v2
+
+      - name: load ruby, update gcc, install openssl
+        uses: MSP-Greg/actions-ruby@mswin
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          base: update
+          mingw: openssl
+
+      - name: depends
+        run:  rake install_dependencies
+
+      - name: compile
+        shell: cmd
+        env:
+          RVERS: ${{ matrix.ruby }}
+        run:  |
+          if "%RVERS%" == "mswin" (
+            call "%VCVARS%"
+            rake compile -- --with-openssl-dir=C:/openssl-win --enable-debug
+          ) else (
+            if "%RVERS%" == "2.3" (
+              rake compile -- --with-openssl-dir=C:/openssl-win --enable-debug
+            ) else (
+              rake compile -- --enable-debug
+            )
+          )
+
+      - name: test
+        run:  rake test TESTOPTS="-v --no-show-detail-immediately" OSSL_MDEBUG=1
diff --git a/.github/workflows/ubuntu-macos.yml b/.github/workflows/ubuntu-macos.yml
deleted file mode 100644
index 1a45c365..00000000
--- a/.github/workflows/ubuntu-macos.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-name: Ubuntu-macOS
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    name: >-
-      ${{ matrix.ruby }}  ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ 'ubuntu-18.04', 'macos' ]
-        ruby: [ ruby-head, 2.7, 2.6, 2.5, 2.4, 2.3 ]
-    steps:
-      - name: repo checkout
-        uses: actions/checkout@v2
-
-      - name: load ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-
-      - name: depends
-        run:  rake install_dependencies
-
-      - name: compile
-        run:  rake compile -- --enable-debug
-
-      - name: test
-        run:  rake test TESTOPTS="-v --no-show-detail-immediately" OSSL_MDEBUG=1
-        env:
-          CI: true
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
deleted file mode 100644
index 1638d25d..00000000
--- a/.github/workflows/windows.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-name: Windows
-
-on: [push, pull_request]
-
-jobs:
-  windows:
-    name: >-
-      ${{ matrix.ruby }}  windows-latest
-    runs-on: windows-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ mswin, mingw, 2.7, 2.6, 2.5, 2.4, 2.3 ]
-    steps:
-      - name: repo checkout
-        uses: actions/checkout@v2
-
-      - name: load ruby, update gcc, install openssl
-        uses: MSP-Greg/actions-ruby@mswin
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          base: update
-          mingw: openssl
-
-      - name: depends
-        run:  rake install_dependencies
-
-      - name: compile
-        shell: cmd
-        env:
-          RVERS: ${{ matrix.ruby }}
-        run:  |
-          if "%RVERS%" == "mswin" (
-            call "%VCVARS%"
-            rake compile -- --with-openssl-dir=C:/openssl-win --enable-debug
-          ) else (
-            if "%RVERS%" == "2.3" (
-              rake compile -- --with-openssl-dir=C:/openssl-win --enable-debug
-            ) else (
-              rake compile -- --enable-debug
-            )
-          )
-
-      - name: test
-        run:  rake test TESTOPTS="-v --no-show-detail-immediately" OSSL_MDEBUG=1
-        env:
-          CI: true
-- 
cgit v1.2.3