Should fix conditional RC compilation step for windows only builds

peekxc · Dec 5, 2023 · 23012b4 · 23012b4
1 parent 5d55852
commit 23012b4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -45,7 +45,7 @@ jobs:
           python -m pip install cibuildwheel
           
       - name: Set VSDev RC (windows only)
-        if: ${{ matrix.buildplat[1] }} == 'win'
+        if: runner.os == 'Windows'
         run: | 
           function Invoke-VSDevEnvironment {
             $vswhere = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe"
@@ -59,7 +59,7 @@ jobs:
           }
           Invoke-VSDevEnvironment
           Get-Command rc.exe | Format-Table -AutoSize
-          
+
       - name: Build wheels
         uses: pypa/[email protected]
         env:

diff --git a/tools/cibw_windows.sh b/tools/cibw_windows.sh
@@ -18,5 +18,5 @@
 # Invoke-VSDevEnvironment
 # Get-Command rc.exe | Format-Table -AutoSize
 
-choco install rtools -y --no-progress --force --version=4.0.0.20220206"
+choco install rtools -y --no-progress --force --version=4.0.0.20220206
 set PATH=C:\rtools40\ucrt64\bin\;%PATH%