From fc505694a74d0045c3e1046b12c1b3588c206db4 Mon Sep 17 00:00:00 2001
From: Owen Ou <o@owenou.com>
Date: Sun, 18 Jun 2023 10:50:39 -0700
Subject: Locate bison for Windows build

---
 .github/workflows/ci.yml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f6be4411..2acbad66 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -145,9 +145,11 @@ jobs:
         with:
           update: true
           install: >-
-            base-devel git clang autoconf automake libtool
+            base-devel git clang autoconf automake libtool bison
       - name: Build
         shell: msys2 {0}
+        env:
+          CC: clang -arch ${{ matrix.arch }}
         run: |
           autoreconf -fi
           ./configure --disable-dependency-tracking \
@@ -157,17 +159,22 @@ jobs:
             --with-oniguruma=builtin \
             --disable-shared \
             --enable-static \
-            --enable-all-static
+            --enable-all-static \
+            YACC="$(which bison) -y"
           make
           make dist
           cp jq.exe jq-windows-${{ matrix.suffix }}.exe
       - name: Test
         shell: msys2 {0}
         run: |
-          make SUBDIRS= "TESTS=tests/mantest tests/jqtest tests/onigtest tests/base64test" check
+          make -j3 SUBDIRS= 'TESTS=tests/mantest tests/jqtest tests/onigtest tests/base64test' check
+          make SUBDIRS= TESTS=tests/optionaltest check || true
+          make SUBDIRS= TRACE_TESTS=1 TESTS=tests/shtest check || true
       - name: Upload Test Logs
         if: ${{ failure() }}
         uses: actions/upload-artifact@v3
+        env:
+          CC: clang -arch ${{ matrix.arch }}
         with:
           name: test-logs-windows-${{ matrix.arch }}
           retention-days: 7
-- 
cgit v1.2.3