Fixing Windows 2?

Author: ciaranra

.github/workflows/rust-test.yml

@@ -125,11 +125,70 @@ jobs:
       - name: Install LLVM Tools (Windows)
         if: matrix.os == 'windows-latest'
         run: |
+          Write-Host "==== Installing LLVM with Chocolatey ===="
           choco install llvm
-          echo "C:/Program Files/LLVM/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-          # Verify installation
-          Get-Command llc.exe -ErrorAction SilentlyContinue | Out-String
-          & "C:/Program Files/LLVM/bin/llc.exe" --version
+          
+          Write-Host "==== Checking Environment ===="
+          Write-Host "Current PATH: $env:Path"
+          Write-Host "Chocolatey binaries: $(Get-ChildItem -Path 'C:\ProgramData\chocolatey\bin' -ErrorAction SilentlyContinue | ForEach-Object { $_.Name })"
+          
+          # Find the LLVM installation
+          Write-Host "==== Locating LLVM Installation ===="
+          Write-Host "Checking if llc.exe is in PATH..."
+          $llcCmd = Get-Command llc -ErrorAction SilentlyContinue
+          if ($llcCmd) {
+            $llvmPath = $llcCmd.Source
+            Write-Host "Found llc.exe in PATH at: $llvmPath"
+          } else {
+            Write-Host "llc.exe not found in PATH, checking common locations..."
+            $possiblePaths = @(
+              "C:\Program Files\LLVM\bin\llc.exe",
+              "C:\Program Files (x86)\LLVM\bin\llc.exe",
+              "C:\ProgramData\chocolatey\bin\llc.exe",
+              "C:\ProgramData\chocolatey\lib\llvm\tools\LLVM\bin\llc.exe"
+            )
+            foreach ($path in $possiblePaths) {
+              Write-Host "Checking $path..."
+              if (Test-Path $path) {
+                $llvmPath = $path
+                Write-Host "Found llc.exe at: $path"
+                break
+              } else {
+                Write-Host "$path does not exist"
+              }
+            }
+          }
+          
+          if (-not $llvmPath) {
+            Write-Host "==== LLVM Search: Broad Scan ===="
+            Write-Host "llc.exe not found in common locations. Searching Chocolatey directories..."
+            Get-ChildItem -Path "C:\ProgramData\chocolatey" -Filter "llc.exe" -Recurse -ErrorAction SilentlyContinue | ForEach-Object { Write-Host "Found at: $($_.FullName)" }
+            
+            Write-Host "Searching Program Files..."
+            Get-ChildItem -Path "C:\Program Files" -Filter "llc.exe" -Recurse -ErrorAction SilentlyContinue | ForEach-Object { Write-Host "Found at: $($_.FullName)" }
+            
+            # Find any LLVM directories
+            Write-Host "==== Looking for LLVM directories ===="
+            Get-ChildItem -Path "C:\" -Directory -Filter "*LLVM*" -Recurse -ErrorAction SilentlyContinue | ForEach-Object { Write-Host "LLVM directory: $($_.FullName)" }
+            
+            throw "Could not locate llc.exe. Please check the logs for LLVM installation details."
+          }
+          
+          Write-Host "==== LLVM Configuration ===="
+          $llvmBinDir = Split-Path -Parent $llvmPath
+          Write-Host "LLVM bin directory: $llvmBinDir"
+          Write-Host "Files in LLVM bin directory: $(Get-ChildItem -Path $llvmBinDir -ErrorAction SilentlyContinue | ForEach-Object { $_.Name })"
+          
+          Write-Host "Adding LLVM bin directory to PATH: $llvmBinDir"
+          echo $llvmBinDir | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+          $env:Path += ";$llvmBinDir"
+          
+          # Verify by running llc
+          Write-Host "==== Verifying LLVM Installation ===="
+          Write-Host "Running: & $llvmPath --version"
+          & $llvmPath --version
+          
+          Write-Host "==== LLVM Installation Complete ===="
 
       - name: Compile tests
         run: cargo test --no-run