From 93e8b5710c12170271d63bc4a9eb49f3605f02d0 Mon Sep 17 00:00:00 2001
From: Manlio Perillo <manlio.perillo@gmail.com>
Date: Sat, 29 Apr 2023 16:22:52 +0200
Subject: [PATCH] workflows: remove the custom windows only jobs

Restore the job matrix to run on linux, macos and windows.

Remove lines with extra whitespace.

Improve the documentation of the Eowyn workflow.

Remove the single quoting of the workflow names.
---
 .github/workflows/ci.yml    | 25 ++++---------------------
 .github/workflows/eowyn.yml | 27 ++++++---------------------
 2 files changed, 10 insertions(+), 42 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1633159..d071d8f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,5 +1,4 @@
-name: 'CI'
-# Makes some checks
+name: CI
 
 on:
   pull_request:
@@ -27,12 +26,12 @@ jobs:
 
       - name: Check compatibility with old Zig compilers
         run: ci/compat.sh
-      
-  test-linux_mac:
+
+  test:
     name: Unit Tests
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
     steps:
@@ -46,19 +45,3 @@ jobs:
 
       - name: Run unit tests
         run: zig build test
-        
-  test-windows:
-    name: Unit Test Windows
-    runs-on: windows-latest
-    timeout-minutes: 30
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Setup Zig
-        uses: goto-bus-stop/setup-zig@v2
-        with:
-          version: master
-
-      - name: Run unit tests
-        run: zig build test
diff --git a/.github/workflows/eowyn.yml b/.github/workflows/eowyn.yml
index 8128832..3ac48f7 100644
--- a/.github/workflows/eowyn.yml
+++ b/.github/workflows/eowyn.yml
@@ -1,5 +1,5 @@
-name: 'Eowyn'
-# Tests all exercises
+# Test that exercises work with the latest Zig compiler.
+name: Eowyn
 
 on:
   pull_request:
@@ -13,35 +13,20 @@ defaults:
     shell: bash
 
 jobs:
-  build-linux_mac:
+  build:
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-        
-      - name: Setup Zig
-        uses: goto-bus-stop/setup-zig@v2
-        with:
-          version: master
-          
-      - name: Run Eowyn
-        run: patches/eowyn.sh
-        
-  build-windows:
-    runs-on: windows-latest
-    timeout-minutes: 30
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        
+
       - name: Setup Zig
         uses: goto-bus-stop/setup-zig@v2
         with:
           version: master
-          
+
       - name: Run Eowyn
         run: patches/eowyn.sh