diff options
| author | Chris Boesch <[email protected]> | 2023-04-29 22:49:07 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-04-29 22:49:07 +0200 |
| commit | 6b48914d7ab1259d62e3ef9490dd6eac088ce640 (patch) | |
| tree | 19f4b604d95a4b9caa96eb051a3fc38fa6e159c6 /.github/workflows | |
| parent | edeca973700bcd2f2853d74b7ba5a1526bbca905 (diff) | |
| parent | 0dc6b457705ad45262be4fa5e0ca49cb03f3612c (diff) | |
| download | ziglings-6b48914d7ab1259d62e3ef9490dd6eac088ce640.tar.xz ziglings-6b48914d7ab1259d62e3ef9490dd6eac088ce640.zip | |
Merge pull request #269 from perillo/fix-windows-deadlock
Fix deadlock on Windows
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/ci.yml | 25 | ||||
| -rw-r--r-- | .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 |