Browse Source

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.
Manlio Perillo 2 years ago
parent
commit
93e8b5710c
2 changed files with 10 additions and 42 deletions
  1. 4 21
      .github/workflows/ci.yml
  2. 6 21
      .github/workflows/eowyn.yml

+ 4 - 21
.github/workflows/ci.yml

@@ -1,5 +1,4 @@
-name: 'CI'
-# Makes some checks
+name: CI
 
 
 on:
 on:
   pull_request:
   pull_request:
@@ -27,12 +26,12 @@ jobs:
 
 
       - name: Check compatibility with old Zig compilers
       - name: Check compatibility with old Zig compilers
         run: ci/compat.sh
         run: ci/compat.sh
-      
-  test-linux_mac:
+
+  test:
     name: Unit Tests
     name: Unit Tests
     strategy:
     strategy:
       matrix:
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
     timeout-minutes: 30
     steps:
     steps:
@@ -46,19 +45,3 @@ jobs:
 
 
       - name: Run unit tests
       - name: Run unit tests
         run: zig build test
         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

+ 6 - 21
.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:
 on:
   pull_request:
   pull_request:
@@ -13,35 +13,20 @@ defaults:
     shell: bash
     shell: bash
 
 
 jobs:
 jobs:
-  build-linux_mac:
+  build:
     strategy:
     strategy:
       matrix:
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 30
     timeout-minutes: 30
     steps:
     steps:
       - name: Checkout
       - name: Checkout
         uses: actions/checkout@v3
         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
       - name: Setup Zig
         uses: goto-bus-stop/setup-zig@v2
         uses: goto-bus-stop/setup-zig@v2
         with:
         with:
           version: master
           version: master
-          
+
       - name: Run Eowyn
       - name: Run Eowyn
         run: patches/eowyn.sh
         run: patches/eowyn.sh