Fix GitHub actions for windows (#3821)

Build was failing due to g++ being moved, causing XSTools.dll build to fail
OpenKore · Oct 23, 2023 · e170a23 · e170a23
1 parent 78d11a2
commit e170a23
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/.github/workflows/build_XSTools.yml b/.github/workflows/build_XSTools.yml
@@ -101,9 +101,16 @@ jobs:
           echo 'mv c:/Strawberry/ c:/Strawberry_old'
           mv c:/Strawberry/ c:/Strawberry_old
         }
-        echo "== remove g++ x64"
-        echo 'rm c:/ProgramData/Chocolatey/bin/g++.exe'
-        rm c:/ProgramData/Chocolatey/bin/g++.exe
+        if ( Test-Path "c:/ProgramData/Chocolatey/bin/g++.exe" -PathType leaf ) {
+          echo "== remove g++ x64"
+          echo 'rm c:/ProgramData/Chocolatey/bin/g++.exe'
+          rm c:/ProgramData/Chocolatey/bin/g++.exe
+        }
+        if ( Test-Path "c:/mingw64/bin/g++.exe" -PathType leaf) {
+          echo "== remove mingw64 g++"
+          echo 'rm c:/mingw64/bin/g++.exe'
+          rm c:/mingw64/bin/g++.exe
+        }
 
     - name: Check the Strawberry cache
       id: cache-strawberry
@@ -256,8 +263,8 @@ jobs:
     - name: Checking for XSTools
       shell: bash
       run: |
-        echo -e "\e[34m# ls -lh | grep XSTools"
-        ls -lh | grep XSTools
+        echo -e "\e[34m# ls -lh | grep XSTools | grep -v notes"
+        ls -lh | grep XSTools | grep -v notes
 
     #############
     # make test #
@@ -442,8 +449,8 @@ jobs:
     - name: Checking for XSTools
       shell: bash
       run: |
-        echo -e "\e[34m# ls -lh | grep XSTools"
-        ls -lh | grep XSTools
+        echo -e "\e[34m# ls -lh | grep XSTools | grep -v notes"
+        ls -lh | grep XSTools | grep -v notes
 
     #############
     # make test #