Build windows 64bit binary using UCRT64

Is the default and recommended msystem setting. Will produce binaries that are compatible with windows 10 and later. Also run tests for 32bit build. Related to #2831
jqlang · Aug 11, 2023 · b3c808c · b3c808c
1 parent 5a52553
commit b3c808c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -196,19 +196,16 @@ jobs:
           - i386
         include:
           - arch: amd64
-            CC: x86_64-pc-msys
-            toolchain: gcc
-            msystem: msys
+            msystem: UCRT64
           - arch: i386
-            CC: i686-w64-mingw32
-            toolchain: mingw-w64-i686-toolchain
-            msystem: mingw32
+            msystem: MINGW32
     runs-on: windows-2022
     env:
-      CHOST: ${{ matrix.CC }}
-      CC: ${{ matrix.CC }}-gcc
       LDFLAGS: -s
       SUFFIX: windows-${{ matrix.arch }}
+    defaults:
+      run:
+        shell: msys2 {0}
     steps:
       - name: Clone repository
         uses: actions/checkout@v3
@@ -224,13 +221,12 @@ jobs:
             autoconf
             automake
             libtool
-            ${{ matrix.toolchain }}
+          pacboy: >-
+            toolchain:p
       - name: Build
-        shell: msys2 {0}
         run: |
           autoreconf -i
           ./configure \
-            --host=${{ matrix.CC }} \
             --disable-docs \
             --disable-valgrind \
             --with-oniguruma=builtin \
@@ -242,9 +238,6 @@ jobs:
           file ./jq.exe
           cp ./jq.exe jq-${{ env.SUFFIX }}.exe
       - name: Test
-        # Only run tests for amd64 matching the CI machine arch
-        if: ${{ matrix.arch == 'amd64' }}
-        shell: msys2 {0}
         run: |
           make check VERBOSE=yes
           git diff --exit-code --ignore-submodules

diff --git a/tests/shtest b/tests/shtest
@@ -101,7 +101,9 @@ jq: ignoring parse error: Truncated value at line 2, column 25
 jq: ignoring parse error: Truncated value at line 2, column 41
 EOF
 printf '1\0362 3\n[0,1\036[4,5]true"ab"{"c":4\036{}{"d":5,"e":6"\036false\n'|$VALGRIND $Q $JQ -ces --seq '. == [2,3,[4,5],true,"ab",{},false]' > /dev/null 2> $d/out
-cmp $d/out $d/expected
+od -c $d/out
+od -c $d/expected
+diff $d/out $d/expected
 
 cat > $d/expected <<EOF
 jq: ignoring parse error: Truncated value at line 2, column 5