try with msys2 shell

Author: tgross35

.github/workflows/main.yaml

@@ -124,63 +124,72 @@ jobs:
     - uses: Swatinem/rust-cache@v2
       with:
         key: ${{ matrix.target }}
-    - name: Cache Docker layers
-      uses: actions/cache@v4
-      if: matrix.os == 'ubuntu-24.04'
-      with:
-        path: /tmp/.buildx-cache
-        key: ${{ matrix.target }}-buildx-${{ github.sha }}
-        restore-keys: ${{ matrix.target }}-buildx-
-    # Configure buildx to use Docker layer caching
-    - uses: docker/setup-buildx-action@v3
-      if: matrix.os == 'ubuntu-24.04'
+    # - name: Cache Docker layers
+    #   uses: actions/cache@v4
+    #   if: matrix.os == 'ubuntu-24.04'
+    #   with:
+    #     path: /tmp/.buildx-cache
+    #     key: ${{ matrix.target }}-buildx-${{ github.sha }}
+    #     restore-keys: ${{ matrix.target }}-buildx-
+    # # Configure buildx to use Docker layer caching
+    # - uses: docker/setup-buildx-action@v3
+    #   if: matrix.os == 'ubuntu-24.04'
 
-    - name: Cache compiler-rt
-      id: cache-compiler-rt
-      uses: actions/cache@v4
-      with:
-        path: compiler-rt
-        key: ${{ runner.os }}-compiler-rt-${{ hashFiles('ci/download-compiler-rt.sh') }}
-    - name: Download compiler-rt reference sources
-      if: steps.cache-compiler-rt.outputs.cache-hit != 'true'
-      run: ./ci/download-compiler-rt.sh
-      shell: bash
-    - run: echo "RUST_COMPILER_RT_ROOT=$(realpath ./compiler-rt)" >> "$GITHUB_ENV"
-      shell: bash
+    # - name: Cache compiler-rt
+    #   id: cache-compiler-rt
+    #   uses: actions/cache@v4
+    #   with:
+    #     path: compiler-rt
+    #     key: ${{ runner.os }}-compiler-rt-${{ hashFiles('ci/download-compiler-rt.sh') }}
+    # - name: Download compiler-rt reference sources
+    #   if: steps.cache-compiler-rt.outputs.cache-hit != 'true'
+    #   run: ./ci/download-compiler-rt.sh
+    #   shell: bash
+    # - run: echo "RUST_COMPILER_RT_ROOT=$(realpath ./compiler-rt)" >> "$GITHUB_ENV"
+    #   shell: bash
 
-    - name: Verify API list
-      if: matrix.os == 'ubuntu-24.04'
-      run: python3 etc/update-api-list.py --check
+    # - name: Verify API list
+    #   if: matrix.os == 'ubuntu-24.04'
+    #   run: python3 etc/update-api-list.py --check
 
-    - name: Windows CI setup
+    - uses: msys2/setup-msys2@v2
       if: matrix.os == 'windows-2025'
-      shell: bash
-      run: ./ci/setup-windows.sh ${{ matrix.target }}
+      with:
+        msystem: UCRT64
+        update: true
+        install: m4
 
-    # Non-linux tests just use our raw script
-    - name: Run locally
-      if: matrix.os != 'ubuntu-24.04'
-      shell: bash
-      run: ./ci/run.sh ${{ matrix.target }}
+    - name: Run on Windows
+      if: matrix.os == 'windows-2025'
+      shell: msys2 {0}
+      run:
+        ./ci/setup-windows.sh ${{ matrix.target }}
+        ./ci/run.sh ${{ matrix.target }}
 
-    # Otherwise we use our docker containers to run builds
-    - name: Run in Docker
-      if: matrix.os == 'ubuntu-24.04'
-      run: ./ci/run-docker.sh ${{ matrix.target }}
+    # # Non-linux tests just use our raw script
+    # - name: Run locally
+    #   if: matrix.os != 'ubuntu-24.04'
+    #   shell: bash
+    #   run: ./ci/run.sh ${{ matrix.target }}
 
-    - name: Print test logs if available
-      if: always()
-      run: if [ -f "target/test-log.txt" ]; then cat target/test-log.txt; fi
-      shell: bash
+    # # Otherwise we use our docker containers to run builds
+    # - name: Run in Docker
+    #   if: matrix.os == 'ubuntu-24.04'
+    #   run: ./ci/run-docker.sh ${{ matrix.target }}
 
-    # Workaround to keep Docker cache smaller
-    # https://github.com/docker/build-push-action/issues/252
-    # https://github.com/moby/buildkit/issues/1896
-    - name: Move Docker cache
-      if: matrix.os == 'ubuntu-24.04'
-      run: |
-        rm -rf /tmp/.buildx-cache
-        mv /tmp/.buildx-cache-new /tmp/.buildx-cache
+    # - name: Print test logs if available
+    #   if: always()
+    #   run: if [ -f "target/test-log.txt" ]; then cat target/test-log.txt; fi
+    #   shell: bash
+
+    # # Workaround to keep Docker cache smaller
+    # # https://github.com/docker/build-push-action/issues/252
+    # # https://github.com/moby/buildkit/issues/1896
+    # - name: Move Docker cache
+    #   if: matrix.os == 'ubuntu-24.04'
+    #   run: |
+    #     rm -rf /tmp/.buildx-cache
+    #     mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
   clippy:
     name: Clippy