Fix CI for i686-pc-windows-gnu (#809)

* Fix CI for i686-pc-windows-gnu

* Also fix msys2 CI jobs

Author: justsmth

.github/workflows/cross.yml

@@ -333,6 +333,7 @@ jobs:
           update: true
           pacboy: >-
             rust-bindgen
+            ninja
             cc
             nasm
             go
@@ -343,6 +344,7 @@ jobs:
           echo "GOROOT=${{ steps.setup_msys2.outputs.msys2-location }}\${{ matrix.sys }}\lib\go" >> $GITHUB_ENV
           echo "CC=${{ steps.setup_msys2.outputs.msys2-location }}\${{ matrix.sys }}\bin\${{ matrix.cc }}.exe" >> $GITHUB_ENV
           echo "CXX=${{ steps.setup_msys2.outputs.msys2-location }}\${{ matrix.sys }}\bin\${{ matrix.cxx }}.exe" >> $GITHUB_ENV
+          echo "CMAKE_GENERATOR=Ninja" >> $GITHUB_ENV
           echo "${{ steps.setup_msys2.outputs.msys2-location }}\${{ matrix.sys }}\bin" >> $GITHUB_PATH
       - name: Checkout
         uses: actions/checkout@v4

Cross.toml

@@ -9,6 +9,14 @@ pre-build = [
     "apt install --assume-yes --install-recommends winehq-stable",
 ]
 
+[target.i686-pc-windows-gnu]
+pre-build = [
+    "apt-get update && apt-get install --assume-yes nasm wget",
+    "mkdir -pm755 /etc/apt/keyrings",
+    "wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/ubuntu/dists/jammy/winehq-jammy.sources",
+    "apt install --assume-yes --install-recommends winehq-stable",
+]
+
 [build.env]
 passthrough = [
     "AWS_LC_FIPS_SYS_EXTERNAL_BINDGEN",