1

Author: dkropachev

.github/workflows/lib-build-and-push.yml

@@ -119,36 +119,35 @@ jobs:
 #        if: runner.os == 'Windows'
 #        run: echo "C:\msys64\mingw64\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
 
-      - name: Add clang path to $PATH env
-        if: runner.os == 'Windows'
-        run: |
-          echo "CC=clang" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-          echo "CXX=clang++" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-
-      - name: Check Clang Version
-        run: clang --version
+#      - name: Add clang path to $PATH env
+#        if: runner.os == 'Windows'
+#        run: |
+#          echo "CC=clang" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+#          echo "CXX=clang++" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
-      - name: Force Clang for Compilation
+      - name: Install MSYS2
         run: |
-          echo "[build]" >> $HOME/.pydistutils.cfg
-          echo "compiler=clang" >> $HOME/.pydistutils.cfg
+          choco install msys2 --no-progress --yes
+          refreshenv
 
-      - name: Ensure cl.exe is Removed
+      - name: Update MSYS2 and install toolchain
+        shell: msys2 {0}
         run: |
-          cl.exe --version
+          pacman -Syu --noconfirm
+          pacman -S --noconfirm --needed mingw-w64-x86_64-gcc
 
       - name: Build wheels for windows
         if: runner.os == 'Windows'
         run: |
-          $envPath = $env:Path
-          echo $envPath
-          $pathArray = $envPath -split ";"
-          $filteredPaths = $pathArray | Where-Object { $_ -notmatch "Microsoft Visual Studio" }
-          $newPath = ($filteredPaths -join ";").TrimEnd(";")
-          echo $newPath
-          $env:Path = $newPath
-          [System.Environment]::SetEnvironmentVariable("Path", $newPath, "User")
           python3 -m cibuildwheel --output-dir wheelhouse
+        env:
+          # Make sure to put MinGW64 bin folder first in PATH
+          CIBW_BEFORE_ALL_WINDOWS: |
+            set PATH=C:\msys64\mingw64\bin;%PATH%
+          # Use gcc/g++ from MinGW
+          CIBW_ENVIRONMENT_WINDOWS: |
+            CC=gcc
+            CXX=g++
 
       - name: Build wheels
         if: runner.os != 'Windows'