loc

Author: kornelski

.github/workflows/ci.yml

@@ -210,6 +210,7 @@ jobs:
     env:
       CARGO_HOME: ${{ github.workspace }}/.cache/cargo
     steps:
+    - run: git config --global core.autocrlf input || true
     - uses: actions/checkout@v4
       with:
         submodules: 'recursive'
@@ -253,19 +254,16 @@ jobs:
           mingw-w64-i686-cmake
           mingw-w64-i686-ninja
     - name: Prepend 32-bit MinGW to PATH
-      if: matrix.thing == 'i686-mingw'
-      shell: bash
-      run: |
-        echo "/c/msys64/mingw32/bin" >> $GITHUB_PATH
-        echo "/c/msys64/usr/bin" >> $GITHUB_PATH
-    - name: Verify Compiler Location
       if: matrix.thing == 'i686-mingw'
       shell: bash
       env: ${{ matrix.custom_env }}
       run: |
+        echo "${{ steps.msys2.outputs.msys2-location }}/mingw32/bin" >> $GITHUB_PATH
+        echo "${{ steps.msys2.outputs.msys2-location }}/usr/bin" >> $GITHUB_PATH
         echo "$PATH"
         echo "$CC"
-        ls -l "$CC" "$C_INCLUDE_PATH" "$LIBRARY_PATH" / /c/msys64 /c/msys64/mingw32/bin/ /c/msys64/mingw32 'C:/msys64' 'C:/msys64/mingw32' || true
+        echo "mingw in ${{ steps.msys2.outputs.msys2-location }}"
+        ls -l "$CC" "$C_INCLUDE_PATH" "$LIBRARY_PATH" / /c/msys64 /c/msys64/mingw32/bin/ /c/msys64/mingw32 'C:/msys64' 'C:/msys64/mingw32' '${{ steps.msys2.outputs.msys2-location }}' || true
         which gcc || echo no-gcc
         gcc --version || echo no-gcc
         "$CC" --version || echo no cc