From 656b314edc0bb3efe028a1419b09c28ba913cab7 Mon Sep 17 00:00:00 2001
From: Wesley Maxey <71408887+wmaxey@users.noreply.github.com>
Date: Thu, 23 Mar 2023 14:59:01 -0700
Subject: [PATCH 01/28] Create main.yml

---
 .github/workflows/main.yml | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 .github/workflows/main.yml

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 0000000000..a87a968fdd
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,37 @@
+on:
+  pull_request:
+    branches:
+    - main
+    
+permissions:
+  contents: read
+  # Needed for the 'trilom/file-changes-action' action
+  pull-requests: read
+  
+  
+# This allows a subsequently queued workflow run to interrupt previous runs
+concurrency:
+  group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
+  cancel-in-progress: true
+  
+  
+jobs:
+  Lit-NoExecutor:
+    runs-on: windows-latest
+    steps:
+      - name: Get utilities
+      - uses: actions/checkout@master
+      - uses: actions/setup-python@v4
+      - uses: microsoft/setup-msbuild@v1.0.2
+        with:
+          vs-version: 'latest'
+
+      - name: Install utilities
+        run: .github\action-scripts\install-cuda-msvc.ps1
+        run: .github\action-scripts\install-ninja.ps1
+        run: py -m pip install lit
+
+      - name: Configure CMake project
+        run: |
+          cmake -S ./ -B ../build -DLIBCUDACXX_ENABLE_LIBCUDACXX_TESTS=ON -G Ninja
+          lit -sv .upstream-tests/test -Dcompute_archs=70,80,90 -Dexecutor="NoopExecutor()" -Dstd=c++20

From a7993efac484df15b71cf1af51c5177a0ca4e50d Mon Sep 17 00:00:00 2001
From: Wesley Maxey <71408887+wmaxey@users.noreply.github.com>
Date: Thu, 23 Mar 2023 15:13:13 -0700
Subject: [PATCH 02/28] Fetch ninja and the CTK on windows.

---
 .github/action-scripts/fetch-cuda.ps1  | 6 ++++++
 .github/action-scripts/fetch-ninja.ps1 | 5 +++++
 2 files changed, 11 insertions(+)
 create mode 100644 .github/action-scripts/fetch-cuda.ps1
 create mode 100644 .github/action-scripts/fetch-ninja.ps1

diff --git a/.github/action-scripts/fetch-cuda.ps1 b/.github/action-scripts/fetch-cuda.ps1
new file mode 100644
index 0000000000..43a6840b97
--- /dev/null
+++ b/.github/action-scripts/fetch-cuda.ps1
@@ -0,0 +1,6 @@
+# Fetch CUDA Toolkit 11.7
+Invoke-WebRequest -Uri "https://developer.download.nvidia.com/compute/cuda/12.1.0/network_installers/cuda_12.1.0_windows_network.exe" -OutFile "./cuda_network.exe"
+./cuda_network.exe -s nvcc_12.1 cudart_12.1
+del ./cuda_network.exe
+
+$env:PATH="$env:PATH;C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v12.1\bin;"
diff --git a/.github/action-scripts/fetch-ninja.ps1 b/.github/action-scripts/fetch-ninja.ps1
new file mode 100644
index 0000000000..726f619dcb
--- /dev/null
+++ b/.github/action-scripts/fetch-ninja.ps1
@@ -0,0 +1,5 @@
+# Fetch Ninja, this is a powershell step because of Expand-Archive
+Invoke-WebRequest -Uri "https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-win.zip" -OutFile "C:\ninja.zip"
+Expand-Archive C:\ninja.zip
+del C:\ninja.zip
+$env:PATH="$env:PATH;C:\ninja"

From df881bc916eb7a85622b71b81f47a7f5c1baab87 Mon Sep 17 00:00:00 2001
From: Wesley Maxey <71408887+wmaxey@users.noreply.github.com>
Date: Thu, 23 Mar 2023 15:13:32 -0700
Subject: [PATCH 03/28] Run in powershell.

---
 .github/workflows/main.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a87a968fdd..ebcf9f75e6 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -30,6 +30,7 @@ jobs:
         run: .github\action-scripts\install-cuda-msvc.ps1
         run: .github\action-scripts\install-ninja.ps1
         run: py -m pip install lit
+        shell: powershell
 
       - name: Configure CMake project
         run: |

From 582f497ff4f6be5a623061fcce211faf952d2e85 Mon Sep 17 00:00:00 2001
From: Wesley Maxey <71408887+wmaxey@users.noreply.github.com>
Date: Thu, 23 Mar 2023 15:18:10 -0700
Subject: [PATCH 04/28] Not sure what I'm doing.

---
 .github/workflows/main.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ebcf9f75e6..1b37a39c9c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -20,9 +20,9 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Get utilities
-      - uses: actions/checkout@master
-      - uses: actions/setup-python@v4
-      - uses: microsoft/setup-msbuild@v1.0.2
+        uses: actions/checkout@master
+        uses: actions/setup-python@v4
+        uses: microsoft/setup-msbuild@v1.0.2
         with:
           vs-version: 'latest'
 

From 8e975b1d326ca2328a663fd11f0d4e5080960a62 Mon Sep 17 00:00:00 2001
From: Wesley Maxey <71408887+wmaxey@users.noreply.github.com>
Date: Thu, 23 Mar 2023 15:21:44 -0700
Subject: [PATCH 05/28] Still don't know what I'm doing.

---
 .github/workflows/main.yml | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1b37a39c9c..6846ec3e43 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -19,16 +19,19 @@ jobs:
   Lit-NoExecutor:
     runs-on: windows-latest
     steps:
-      - name: Get utilities
-        uses: actions/checkout@master
-        uses: actions/setup-python@v4
-        uses: microsoft/setup-msbuild@v1.0.2
-        with:
-          vs-version: 'latest'
+      - uses: actions/checkout@master
+      - uses: actions/setup-python@v4
+      - uses: microsoft/setup-msbuild@v1.0.2
+          with:
+            vs-version: 'latest'
 
-      - name: Install utilities
+      - name: Install CTK
         run: .github\action-scripts\install-cuda-msvc.ps1
+        shell: powershell
+      - name: Install Ninja
         run: .github\action-scripts\install-ninja.ps1
+        shell: powershell
+      - name: Install Lit
         run: py -m pip install lit
         shell: powershell
 
@@ -36,3 +39,4 @@ jobs:
         run: |
           cmake -S ./ -B ../build -DLIBCUDACXX_ENABLE_LIBCUDACXX_TESTS=ON -G Ninja
           lit -sv .upstream-tests/test -Dcompute_archs=70,80,90 -Dexecutor="NoopExecutor()" -Dstd=c++20
+        shell: powershell

From 81fe689d85be4520f5089ff6b20c0cd204153d48 Mon Sep 17 00:00:00 2001
From: Wesley Maxey <71408887+wmaxey@users.noreply.github.com>
Date: Thu, 23 Mar 2023 15:22:07 -0700
Subject: [PATCH 06/28] Fix syntax error?

---
 .github/workflows/main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6846ec3e43..a9652ff4bf 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -22,8 +22,8 @@ jobs:
       - uses: actions/checkout@master
       - uses: actions/setup-python@v4
       - uses: microsoft/setup-msbuild@v1.0.2
-          with:
-            vs-version: 'latest'
+        with:
+          vs-version: 'latest'
 
       - name: Install CTK
         run: .github\action-scripts\install-cuda-msvc.ps1

From 42426e5595af64f6830a651c2258813f03f3a079 Mon Sep 17 00:00:00 2001
From: Wesley Maxey <71408887+wmaxey@users.noreply.github.com>
Date: Thu, 23 Mar 2023 15:23:52 -0700
Subject: [PATCH 07/28] install->fetch typo

---
 .github/workflows/main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a9652ff4bf..9bd35d3c9f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -26,10 +26,10 @@ jobs:
           vs-version: 'latest'
 
       - name: Install CTK
-        run: .github\action-scripts\install-cuda-msvc.ps1
+        run: .github\action-scripts\fetch-cuda.ps1
         shell: powershell
       - name: Install Ninja
-        run: .github\action-scripts\install-ninja.ps1
+        run: .github\action-scripts\fetch-ninja.ps1
         shell: powershell
       - name: Install Lit
         run: py -m pip install lit

From cb79cedbefe8bb5a1c41c0bcf4f168174d5ffd72 Mon Sep 17 00:00:00 2001
From: Wesley Maxey <71408887+wmaxey@users.noreply.github.com>
Date: Thu, 23 Mar 2023 15:30:03 -0700
Subject: [PATCH 08/28] Fix script paths.

---
 .github/action-scripts/fetch-cuda.ps1  | 1 -
 .github/action-scripts/fetch-ninja.ps1 | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/action-scripts/fetch-cuda.ps1 b/.github/action-scripts/fetch-cuda.ps1
index 43a6840b97..3a3e41c59c 100644
--- a/.github/action-scripts/fetch-cuda.ps1
+++ b/.github/action-scripts/fetch-cuda.ps1
@@ -1,6 +1,5 @@
 # Fetch CUDA Toolkit 11.7
 Invoke-WebRequest -Uri "https://developer.download.nvidia.com/compute/cuda/12.1.0/network_installers/cuda_12.1.0_windows_network.exe" -OutFile "./cuda_network.exe"
 ./cuda_network.exe -s nvcc_12.1 cudart_12.1
-del ./cuda_network.exe
 
 $env:PATH="$env:PATH;C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v12.1\bin;"
diff --git a/.github/action-scripts/fetch-ninja.ps1 b/.github/action-scripts/fetch-ninja.ps1
index 726f619dcb..a1b9e42e36 100644
--- a/.github/action-scripts/fetch-ninja.ps1
+++ b/.github/action-scripts/fetch-ninja.ps1
@@ -1,5 +1,5 @@
 # Fetch Ninja, this is a powershell step because of Expand-Archive
-Invoke-WebRequest -Uri "https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-win.zip" -OutFile "C:\ninja.zip"
-Expand-Archive C:\ninja.zip
-del C:\ninja.zip
-$env:PATH="$env:PATH;C:\ninja"
+Invoke-WebRequest -Uri "https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-win.zip" -OutFile "./ninja.zip"
+Expand-Archive ./ninja.zip
+
+$env:PATH="$env:PATH;$(pwd)\ninja"

From ec9f47fd66a1ae3f4ad55272e4c1e13d633ddf08 Mon Sep 17 00:00:00 2001
From: Wesley Maxey <71408887+wmaxey@users.noreply.github.com>
Date: Thu, 23 Mar 2023 15:37:53 -0700
Subject: [PATCH 09/28] Spaces, not commas for architecture parameter.

---
 .github/workflows/main.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9bd35d3c9f..7dc37ddbf8 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -5,10 +5,8 @@ on:
     
 permissions:
   contents: read
-  # Needed for the 'trilom/file-changes-action' action
   pull-requests: read
   
-  
 # This allows a subsequently queued workflow run to interrupt previous runs
 concurrency:
   group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
@@ -38,5 +36,5 @@ jobs:
       - name: Configure CMake project
         run: |
           cmake -S ./ -B ../build -DLIBCUDACXX_ENABLE_LIBCUDACXX_TESTS=ON -G Ninja
-          lit -sv .upstream-tests/test -Dcompute_archs=70,80,90 -Dexecutor="NoopExecutor()" -Dstd=c++20
+          lit -sv .upstream-tests/test -Dcompute_archs="70 80 90" -Dexecutor="NoopExecutor()" -Dstd=c++20
         shell: powershell

From 40d88d170af74adaf7e9641114a4ca1062ad49f3 Mon Sep 17 00:00:00 2001
From: Wesley Maxey <71408887+wmaxey@users.noreply.github.com>
Date: Thu, 23 Mar 2023 15:56:59 -0700
Subject: [PATCH 10/28] Try to convince CMake to find the CTK from nvcc on the
 path.

---
 .github/action-scripts/fetch-cuda.ps1 | 1 +
 .github/workflows/main.yml            | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/action-scripts/fetch-cuda.ps1 b/.github/action-scripts/fetch-cuda.ps1
index 3a3e41c59c..a39f65ce62 100644
--- a/.github/action-scripts/fetch-cuda.ps1
+++ b/.github/action-scripts/fetch-cuda.ps1
@@ -3,3 +3,4 @@ Invoke-WebRequest -Uri "https://developer.download.nvidia.com/compute/cuda/12.1.
 ./cuda_network.exe -s nvcc_12.1 cudart_12.1
 
 $env:PATH="$env:PATH;C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v12.1\bin;"
+$env:CUDA_PATH="C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v12.1"
\ No newline at end of file
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 7dc37ddbf8..36004a233c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -35,6 +35,6 @@ jobs:
 
       - name: Configure CMake project
         run: |
-          cmake -S ./ -B ../build -DLIBCUDACXX_ENABLE_LIBCUDACXX_TESTS=ON -G Ninja
-          lit -sv .upstream-tests/test -Dcompute_archs="70 80 90" -Dexecutor="NoopExecutor()" -Dstd=c++20
+          cmake -S ./ -B ../build -DLIBCUDACXX_ENABLE_LIBCUDACXX_TESTS=ON -DCMAKE_CUDA_COMPILER=nvcc -G Ninja
+          py -m lit -sv .upstream-tests/test -Dcompute_archs="70 80 90" -Dexecutor="NoopExecutor()" -Dstd=c++20
         shell: powershell

From 033c426d31105c6c16daef6108e465017b4ba7ad Mon Sep 17 00:00:00 2001
From: Wesley Maxey <71408887+wmaxey@users.noreply.github.com>
Date: Thu, 23 Mar 2023 16:12:59 -0700
Subject: [PATCH 11/28] Use cl.exe for CMAKE_CXX_COMPILER

---
 .github/action-scripts/configure-vcvars.ps1 | 35 +++++++++++++++++++++
 .github/workflows/main.yml                  |  8 ++---
 2 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 .github/action-scripts/configure-vcvars.ps1

diff --git a/.github/action-scripts/configure-vcvars.ps1 b/.github/action-scripts/configure-vcvars.ps1
new file mode 100644
index 0000000000..6fdd536c09
--- /dev/null
+++ b/.github/action-scripts/configure-vcvars.ps1
@@ -0,0 +1,35 @@
+
+if (Test-Path -Path $EnvVarBackup) {
+    Remove-Item -Path $EnvVarBackup
+}
+
+function Get-VSDevPrompt {
+    param([string]$vcver = "14.16")
+    if (Test-Path -Path $EnvVarBackup) {
+        Remove-Item -Path "ENV:*"
+        Import-CliXml $EnvVarBackup | % { Set-Item -force -path "env:$($_.Name)" $_.Value }
+        Remove-Item $EnvVarBackup
+    }
+
+    # Save all the process' environment variables in CLIXML format.
+    Get-ChildItem env: | Export-CliXml $EnvVarBackup
+    $BuildPath = $MSBuildPathMap[$vcver]
+    Write-Output "Loading VC from: $BuildPath"
+
+    Push-Location "$BuildPath"
+    cmd /c "vcvars64.bat -vcvars_ver=$vcver & set" |
+        foreach {
+            if ($_ -match "=") {
+                $v = $_.split("="); set-item -force -path "ENV:\$($v[0])"  -value "$($v[1])"
+            }
+        }
+    Pop-Location
+
+    # Stupid, but makes cl.exe happy
+    $global:CC_FP = $(get-command cl).Source.Replace("\","/")
+
+    Write-Host "`nVisual Studio Command Prompt variables set." -ForegroundColor Yellow
+    Write-Host "Use `$CC_FP as shortcut for Cmake: $CC_FP" -ForegroundColor Yellow
+}
+
+Export-ModuleMember -Function Get-VSDevPrompt
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 36004a233c..52f3fcdbd4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -18,7 +18,6 @@ jobs:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@master
-      - uses: actions/setup-python@v4
       - uses: microsoft/setup-msbuild@v1.0.2
         with:
           vs-version: 'latest'
@@ -30,11 +29,12 @@ jobs:
         run: .github\action-scripts\fetch-ninja.ps1
         shell: powershell
       - name: Install Lit
-        run: py -m pip install lit
+        run: py -m pip install wheel; py -m pip install lit
         shell: powershell
 
       - name: Configure CMake project
         run: |
-          cmake -S ./ -B ../build -DLIBCUDACXX_ENABLE_LIBCUDACXX_TESTS=ON -DCMAKE_CUDA_COMPILER=nvcc -G Ninja
-          py -m lit -sv .upstream-tests/test -Dcompute_archs="70 80 90" -Dexecutor="NoopExecutor()" -Dstd=c++20
+          echo "$CUDA_PATH"
+          cmake -S ./ -B ../build -DLIBCUDACXX_ENABLE_LIBCUDACXX_TESTS=ON -DCMAKE_CXX_COMPILER=cl.exe -DCMAKE_CUDA_COMPILER=nvcc -G Ninja
+          lit -sv .upstream-tests/test -Dcompute_archs="70 80 90" -Dexecutor="NoopExecutor()" -Dstd=c++20
         shell: powershell

From f97a54a4947e1ff8a48922b67b64c2a888f41052 Mon Sep 17 00:00:00 2001
From: Wesley Maxey <71408887+wmaxey@users.noreply.github.com>
Date: Thu, 23 Mar 2023 16:18:58 -0700
Subject: [PATCH 12/28] Add a script for hacking out vcvars.

---
 .github/action-scripts/configure-vcvars.ps1 | 43 +++++++--------------
 .github/workflows/main.yml                  |  3 ++
 2 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/.github/action-scripts/configure-vcvars.ps1 b/.github/action-scripts/configure-vcvars.ps1
index 6fdd536c09..ee090c6530 100644
--- a/.github/action-scripts/configure-vcvars.ps1
+++ b/.github/action-scripts/configure-vcvars.ps1
@@ -1,35 +1,18 @@
+$msvcPath = "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
 
-if (Test-Path -Path $EnvVarBackup) {
-    Remove-Item -Path $EnvVarBackup
-}
+Write-Output "Loading VC from: $msvcPath"
 
-function Get-VSDevPrompt {
-    param([string]$vcver = "14.16")
-    if (Test-Path -Path $EnvVarBackup) {
-        Remove-Item -Path "ENV:*"
-        Import-CliXml $EnvVarBackup | % { Set-Item -force -path "env:$($_.Name)" $_.Value }
-        Remove-Item $EnvVarBackup
-    }
-
-    # Save all the process' environment variables in CLIXML format.
-    Get-ChildItem env: | Export-CliXml $EnvVarBackup
-    $BuildPath = $MSBuildPathMap[$vcver]
-    Write-Output "Loading VC from: $BuildPath"
-
-    Push-Location "$BuildPath"
-    cmd /c "vcvars64.bat -vcvars_ver=$vcver & set" |
-        foreach {
-            if ($_ -match "=") {
-                $v = $_.split("="); set-item -force -path "ENV:\$($v[0])"  -value "$($v[1])"
-            }
+Push-Location "$msvcPath"
+cmd /c "vcvars64.bat & set" |
+    foreach {
+        if ($_ -match "=") {
+            $v = $_.split("="); set-item -force -path "ENV:\$($v[0])"  -value "$($v[1])"
         }
-    Pop-Location
-
-    # Stupid, but makes cl.exe happy
-    $global:CC_FP = $(get-command cl).Source.Replace("\","/")
+    }
+Pop-Location
 
-    Write-Host "`nVisual Studio Command Prompt variables set." -ForegroundColor Yellow
-    Write-Host "Use `$CC_FP as shortcut for Cmake: $CC_FP" -ForegroundColor Yellow
-}
+# Stupid, but makes cl.exe happy
+$global:CC_FP = $(get-command cl).Source.Replace("\","/")
 
-Export-ModuleMember -Function Get-VSDevPrompt
+Write-Host "`nVisual Studio Command Prompt variables set." -ForegroundColor Yellow
+Write-Host "Use `$CC_FP as shortcut for Cmake: $CC_FP" -ForegroundColor Yellow
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 52f3fcdbd4..fa3d23b889 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -31,6 +31,9 @@ jobs:
       - name: Install Lit
         run: py -m pip install wheel; py -m pip install lit
         shell: powershell
+      - name: Configure env for vsdev prompt
+        run: .github\action-scripts\configure-vcvars.ps1
+        shell: powershell
 
       - name: Configure CMake project
         run: |

From b3c6ce14e9b7087596c70828df0b4a36e361889d Mon Sep 17 00:00:00 2001
From: Wesley Maxey <71408887+wmaxey@users.noreply.github.com>
Date: Thu, 23 Mar 2023 16:27:40 -0700
Subject: [PATCH 13/28] Change path for msvc.

---
 .github/action-scripts/configure-vcvars.ps1 | 2 +-
 .github/workflows/main.yml                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/action-scripts/configure-vcvars.ps1 b/.github/action-scripts/configure-vcvars.ps1
index ee090c6530..e1ea9a7eab 100644
--- a/.github/action-scripts/configure-vcvars.ps1
+++ b/.github/action-scripts/configure-vcvars.ps1
@@ -1,4 +1,4 @@
-$msvcPath = "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+$msvcPath = "C:\Program Files\Microsoft Visual Studio\2022\VC\Auxiliary\Build\vcvars64.bat"
 
 Write-Output "Loading VC from: $msvcPath"
 
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index fa3d23b889..fa86bc60aa 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -38,6 +38,6 @@ jobs:
       - name: Configure CMake project
         run: |
           echo "$CUDA_PATH"
-          cmake -S ./ -B ../build -DLIBCUDACXX_ENABLE_LIBCUDACXX_TESTS=ON -DCMAKE_CXX_COMPILER=cl.exe -DCMAKE_CUDA_COMPILER=nvcc -G Ninja
+          cmake -S ./ -B ../build -DLIBCUDACXX_ENABLE_LIBCUDACXX_TESTS=ON -DCMAKE_CXX_COMPILER=cl -DCMAKE_CUDA_COMPILER=nvcc -G Ninja
           lit -sv .upstream-tests/test -Dcompute_archs="70 80 90" -Dexecutor="NoopExecutor()" -Dstd=c++20
         shell: powershell

From 05da0473fbda043cf13de3bb687a8a11f3b80cd5 Mon Sep 17 00:00:00 2001
From: Wesley Maxey <71408887+wmaxey@users.noreply.github.com>
Date: Thu, 23 Mar 2023 16:34:31 -0700
Subject: [PATCH 14/28] Try different method to get vs install path.

---
 .github/action-scripts/configure-vcvars.ps1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/action-scripts/configure-vcvars.ps1 b/.github/action-scripts/configure-vcvars.ps1
index e1ea9a7eab..2f29b6cee6 100644
--- a/.github/action-scripts/configure-vcvars.ps1
+++ b/.github/action-scripts/configure-vcvars.ps1
@@ -1,8 +1,8 @@
-$msvcPath = "C:\Program Files\Microsoft Visual Studio\2022\VC\Auxiliary\Build\vcvars64.bat"
+$msvcPath = "$(vswhere -products * -latest -property installationPath)"
 
-Write-Output "Loading VC from: $msvcPath"
+Write-Output "Loading VC from: $msvcPath\VC\Auxiliary\Build"
 
-Push-Location "$msvcPath"
+Push-Location "$msvcPath\VC\Auxiliary\Build"
 cmd /c "vcvars64.bat & set" |
     foreach {
         if ($_ -match "=") {

From 890df410bf669d2cbdeb43f66cc88499cb348a80 Mon Sep 17 00:00:00 2001
From: Wesley Maxey <71408887+wmaxey@users.noreply.github.com>
Date: Thu, 23 Mar 2023 16:56:31 -0700
Subject: [PATCH 15/28] move stuff to same script to possibly keep env vars
 live.

---
 .github/workflows/main.yml | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index fa86bc60aa..c7d0ee33df 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -22,21 +22,15 @@ jobs:
         with:
           vs-version: 'latest'
 
-      - name: Install CTK
-        run: .github\action-scripts\fetch-cuda.ps1
-        shell: powershell
-      - name: Install Ninja
-        run: .github\action-scripts\fetch-ninja.ps1
-        shell: powershell
       - name: Install Lit
         run: py -m pip install wheel; py -m pip install lit
         shell: powershell
-      - name: Configure env for vsdev prompt
-        run: .github\action-scripts\configure-vcvars.ps1
-        shell: powershell
 
       - name: Configure CMake project
         run: |
+          .github\action-scripts\fetch-cuda.ps1
+          .github\action-scripts\fetch-ninja.ps1
+          .github\action-scripts\configure-vcvars.ps1
           echo "$CUDA_PATH"
           cmake -S ./ -B ../build -DLIBCUDACXX_ENABLE_LIBCUDACXX_TESTS=ON -DCMAKE_CXX_COMPILER=cl -DCMAKE_CUDA_COMPILER=nvcc -G Ninja
           lit -sv .upstream-tests/test -Dcompute_archs="70 80 90" -Dexecutor="NoopExecutor()" -Dstd=c++20

From 0f9111d477d9953bf64efca6d023494db94aa005 Mon Sep 17 00:00:00 2001
From: Wesley Maxey <71408887+wmaxey@users.noreply.github.com>
Date: Thu, 23 Mar 2023 17:17:11 -0700
Subject: [PATCH 16/28] Set GITHUB_ENV between steps.

---
 .github/action-scripts/fetch-cuda.ps1  |  5 ++++-
 .github/action-scripts/fetch-ninja.ps1 |  1 +
 .github/workflows/main.yml             | 10 +++++-----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.github/action-scripts/fetch-cuda.ps1 b/.github/action-scripts/fetch-cuda.ps1
index a39f65ce62..f66533f694 100644
--- a/.github/action-scripts/fetch-cuda.ps1
+++ b/.github/action-scripts/fetch-cuda.ps1
@@ -3,4 +3,7 @@ Invoke-WebRequest -Uri "https://developer.download.nvidia.com/compute/cuda/12.1.
 ./cuda_network.exe -s nvcc_12.1 cudart_12.1
 
 $env:PATH="$env:PATH;C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v12.1\bin;"
-$env:CUDA_PATH="C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v12.1"
\ No newline at end of file
+$env:CUDA_PATH="C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v12.1"
+
+echo "$env:PATH"      >> $env:GITHUB_ENV
+echo "$env:CUDA_PATH" >> $env:GITHUB_ENV
\ No newline at end of file
diff --git a/.github/action-scripts/fetch-ninja.ps1 b/.github/action-scripts/fetch-ninja.ps1
index a1b9e42e36..8cd8c7a8c9 100644
--- a/.github/action-scripts/fetch-ninja.ps1
+++ b/.github/action-scripts/fetch-ninja.ps1
@@ -3,3 +3,4 @@ Invoke-WebRequest -Uri "https://github.com/ninja-build/ninja/releases/download/v
 Expand-Archive ./ninja.zip
 
 $env:PATH="$env:PATH;$(pwd)\ninja"
+echo "$env:PATH"      >> $env:GITHUB_ENV
\ No newline at end of file
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c7d0ee33df..3c4447e6bb 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -18,18 +18,18 @@ jobs:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@master
-      - uses: microsoft/setup-msbuild@v1.0.2
-        with:
-          vs-version: 'latest'
 
       - name: Install Lit
         run: py -m pip install wheel; py -m pip install lit
         shell: powershell
 
-      - name: Configure CMake project
-        run: |
+      - name: Fetch pre-reqs
+        run: | 
           .github\action-scripts\fetch-cuda.ps1
           .github\action-scripts\fetch-ninja.ps1
+
+      - name: Configure CMake project
+        run: |
           .github\action-scripts\configure-vcvars.ps1
           echo "$CUDA_PATH"
           cmake -S ./ -B ../build -DLIBCUDACXX_ENABLE_LIBCUDACXX_TESTS=ON -DCMAKE_CXX_COMPILER=cl -DCMAKE_CUDA_COMPILER=nvcc -G Ninja

From 2ab5e40dbac0f34857b476be8f5c12a488cf7e93 Mon Sep 17 00:00:00 2001
From: Wesley Maxey <71408887+wmaxey@users.noreply.github.com>
Date: Thu, 23 Mar 2023 17:20:30 -0700
Subject: [PATCH 17/28] I'm an idiot.

---
 .github/action-scripts/fetch-cuda.ps1  | 4 ++--
 .github/action-scripts/fetch-ninja.ps1 | 2 +-
 .github/workflows/main.yml             | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/action-scripts/fetch-cuda.ps1 b/.github/action-scripts/fetch-cuda.ps1
index f66533f694..a55edc2a87 100644
--- a/.github/action-scripts/fetch-cuda.ps1
+++ b/.github/action-scripts/fetch-cuda.ps1
@@ -5,5 +5,5 @@ Invoke-WebRequest -Uri "https://developer.download.nvidia.com/compute/cuda/12.1.
 $env:PATH="$env:PATH;C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v12.1\bin;"
 $env:CUDA_PATH="C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v12.1"
 
-echo "$env:PATH"      >> $env:GITHUB_ENV
-echo "$env:CUDA_PATH" >> $env:GITHUB_ENV
\ No newline at end of file
+echo "PATH=$env:PATH"      >> $env:GITHUB_ENV
+echo "CUDA_PATH=$env:CUDA_PATH" >> $env:GITHUB_ENV
\ No newline at end of file
diff --git a/.github/action-scripts/fetch-ninja.ps1 b/.github/action-scripts/fetch-ninja.ps1
index 8cd8c7a8c9..8cd222e51c 100644
--- a/.github/action-scripts/fetch-ninja.ps1
+++ b/.github/action-scripts/fetch-ninja.ps1
@@ -3,4 +3,4 @@ Invoke-WebRequest -Uri "https://github.com/ninja-build/ninja/releases/download/v
 Expand-Archive ./ninja.zip
 
 $env:PATH="$env:PATH;$(pwd)\ninja"
-echo "$env:PATH"      >> $env:GITHUB_ENV
\ No newline at end of file
+echo "PATH=$env:PATH" >> $env:GITHUB_ENV
\ No newline at end of file
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3c4447e6bb..723df8e259 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -12,7 +12,6 @@ concurrency:
   group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
   cancel-in-progress: true
   
-  
 jobs:
   Lit-NoExecutor:
     runs-on: windows-latest
@@ -33,5 +32,5 @@ jobs:
           .github\action-scripts\configure-vcvars.ps1
           echo "$CUDA_PATH"
           cmake -S ./ -B ../build -DLIBCUDACXX_ENABLE_LIBCUDACXX_TESTS=ON -DCMAKE_CXX_COMPILER=cl -DCMAKE_CUDA_COMPILER=nvcc -G Ninja
-          lit -sv .upstream-tests/test -Dcompute_archs="70 80 90" -Dexecutor="NoopExecutor()" -Dstd=c++20
+          lit -sv .upstream-tests/test -Dcompute_archs=90 -Dexecutor="NoopExecutor()" -Dstd=c++20
         shell: powershell

From 04c0b56638b0c2793d58dbfd5850aa596d3290bf Mon Sep 17 00:00:00 2001
From: Wesley Maxey <71408887+wmaxey@users.noreply.github.com>
Date: Thu, 23 Mar 2023 17:25:24 -0700
Subject: [PATCH 18/28] Also send CL environment variables up the chain.

---
 .github/action-scripts/configure-vcvars.ps1 |  2 ++
 .github/action-scripts/fetch-cuda.ps1       |  8 ++++----
 .github/action-scripts/fetch-ninja.ps1      |  4 ++--
 .github/workflows/main.yml                  | 15 +++++++++------
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/.github/action-scripts/configure-vcvars.ps1 b/.github/action-scripts/configure-vcvars.ps1
index 2f29b6cee6..c6c7ae2246 100644
--- a/.github/action-scripts/configure-vcvars.ps1
+++ b/.github/action-scripts/configure-vcvars.ps1
@@ -7,6 +7,7 @@ cmd /c "vcvars64.bat & set" |
     foreach {
         if ($_ -match "=") {
             $v = $_.split("="); set-item -force -path "ENV:\$($v[0])"  -value "$($v[1])"
+            echo "$($v[0])=$($v[1])" >> $ENV:GITHUB_ENV
         }
     }
 Pop-Location
@@ -16,3 +17,4 @@ $global:CC_FP = $(get-command cl).Source.Replace("\","/")
 
 Write-Host "`nVisual Studio Command Prompt variables set." -ForegroundColor Yellow
 Write-Host "Use `$CC_FP as shortcut for Cmake: $CC_FP" -ForegroundColor Yellow
+
diff --git a/.github/action-scripts/fetch-cuda.ps1 b/.github/action-scripts/fetch-cuda.ps1
index a55edc2a87..c53e72621a 100644
--- a/.github/action-scripts/fetch-cuda.ps1
+++ b/.github/action-scripts/fetch-cuda.ps1
@@ -2,8 +2,8 @@
 Invoke-WebRequest -Uri "https://developer.download.nvidia.com/compute/cuda/12.1.0/network_installers/cuda_12.1.0_windows_network.exe" -OutFile "./cuda_network.exe"
 ./cuda_network.exe -s nvcc_12.1 cudart_12.1
 
-$env:PATH="$env:PATH;C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v12.1\bin;"
-$env:CUDA_PATH="C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v12.1"
+$ENV:PATH="$ENV:PATH;C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v12.1\bin;"
+$ENV:CUDA_PATH="C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v12.1"
 
-echo "PATH=$env:PATH"      >> $env:GITHUB_ENV
-echo "CUDA_PATH=$env:CUDA_PATH" >> $env:GITHUB_ENV
\ No newline at end of file
+echo "PATH=$ENV:PATH"      >> $ENV:GITHUB_ENV
+echo "CUDA_PATH=$ENV:CUDA_PATH" >> $ENV:GITHUB_ENV
diff --git a/.github/action-scripts/fetch-ninja.ps1 b/.github/action-scripts/fetch-ninja.ps1
index 8cd222e51c..63f4748d52 100644
--- a/.github/action-scripts/fetch-ninja.ps1
+++ b/.github/action-scripts/fetch-ninja.ps1
@@ -2,5 +2,5 @@
 Invoke-WebRequest -Uri "https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-win.zip" -OutFile "./ninja.zip"
 Expand-Archive ./ninja.zip
 
-$env:PATH="$env:PATH;$(pwd)\ninja"
-echo "PATH=$env:PATH" >> $env:GITHUB_ENV
\ No newline at end of file
+$ENV:PATH="$ENV:PATH;$(pwd)\ninja"
+echo "PATH=$ENV:PATH" >> $ENV:GITHUB_ENV
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 723df8e259..47724ead95 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -22,15 +22,18 @@ jobs:
         run: py -m pip install wheel; py -m pip install lit
         shell: powershell
 
-      - name: Fetch pre-reqs
-        run: | 
-          .github\action-scripts\fetch-cuda.ps1
-          .github\action-scripts\fetch-ninja.ps1
+      - name: Fetch CUDA Toolkit
+        run: .github\action-scripts\fetch-cuda.ps1
+
+      - name: Fetch Ninja
+        run: .github\action-scripts\fetch-ninja.ps1
+      
+      - name: Set vcvars
+        run: .github\action-scripts\configure-vcvars.ps1
 
       - name: Configure CMake project
         run: |
-          .github\action-scripts\configure-vcvars.ps1
-          echo "$CUDA_PATH"
+          echo "CUDA_PATH: $ENV:CUDA_PATH"
           cmake -S ./ -B ../build -DLIBCUDACXX_ENABLE_LIBCUDACXX_TESTS=ON -DCMAKE_CXX_COMPILER=cl -DCMAKE_CUDA_COMPILER=nvcc -G Ninja
           lit -sv .upstream-tests/test -Dcompute_archs=90 -Dexecutor="NoopExecutor()" -Dstd=c++20
         shell: powershell

From 0dd8ed32d716a7984a24f640135e560df666efb4 Mon Sep 17 00:00:00 2001
From: Wesley Maxey <71408887+wmaxey@users.noreply.github.com>
Date: Thu, 23 Mar 2023 17:32:41 -0700
Subject: [PATCH 19/28] Wait for process to finish.

---
 .github/action-scripts/fetch-cuda.ps1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/action-scripts/fetch-cuda.ps1 b/.github/action-scripts/fetch-cuda.ps1
index c53e72621a..b57a9df61c 100644
--- a/.github/action-scripts/fetch-cuda.ps1
+++ b/.github/action-scripts/fetch-cuda.ps1
@@ -1,8 +1,8 @@
-# Fetch CUDA Toolkit 11.7
+
 Invoke-WebRequest -Uri "https://developer.download.nvidia.com/compute/cuda/12.1.0/network_installers/cuda_12.1.0_windows_network.exe" -OutFile "./cuda_network.exe"
-./cuda_network.exe -s nvcc_12.1 cudart_12.1
+Start-Process -Wait -FilePath ./cuda_network.exe -ArgumentList "-s nvcc_12.1 cudart_12.1"
 
-$ENV:PATH="$ENV:PATH;C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v12.1\bin;"
+$ENV:PATH="$ENV:PATH;C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v12.1\bin"
 $ENV:CUDA_PATH="C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v12.1"
 
 echo "PATH=$ENV:PATH"      >> $ENV:GITHUB_ENV

From 5077e497097d5f12c320be46676a000ab8e5ad5e Mon Sep 17 00:00:00 2001
From: Wesley Maxey <71408887+wmaxey@users.noreply.github.com>
Date: Thu, 23 Mar 2023 17:48:37 -0700
Subject: [PATCH 20/28] Split fetch lit into its own command.

---
 .github/action-scripts/fetch-lit.ps1 | 6 ++++++
 .github/workflows/main.yml           | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 .github/action-scripts/fetch-lit.ps1

diff --git a/.github/action-scripts/fetch-lit.ps1 b/.github/action-scripts/fetch-lit.ps1
new file mode 100644
index 0000000000..32245092bc
--- /dev/null
+++ b/.github/action-scripts/fetch-lit.ps1
@@ -0,0 +1,6 @@
+$python_path=(gi $($(get-command python).path)).Directory.FullName
+py -m pip install wheel
+py -m pip install lit
+
+$ENV:PATH="$ENV:PATH;$(python_path)\Scripts"
+echo "PATH=$ENV:PATH" >> $ENV:GITHUB_ENV
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 47724ead95..6d15f24094 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@master
 
       - name: Install Lit
-        run: py -m pip install wheel; py -m pip install lit
+        run: .github\action-scripts\fetch-lit.ps1
         shell: powershell
 
       - name: Fetch CUDA Toolkit

From 03369ca2684ff3d69cb5124d54e8fa7cd246af8f Mon Sep 17 00:00:00 2001
From: Wesley Maxey <71408887+wmaxey@users.noreply.github.com>
Date: Thu, 23 Mar 2023 17:50:05 -0700
Subject: [PATCH 21/28]  Connecting lit to the build directory.

---
 .github/workflows/main.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6d15f24094..629bc1a632 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -35,5 +35,6 @@ jobs:
         run: |
           echo "CUDA_PATH: $ENV:CUDA_PATH"
           cmake -S ./ -B ../build -DLIBCUDACXX_ENABLE_LIBCUDACXX_TESTS=ON -DCMAKE_CXX_COMPILER=cl -DCMAKE_CUDA_COMPILER=nvcc -G Ninja
+          $ENV:LIBCUDACXX_SITE_CONFIG="$(pwd)/../build/test/lit.site.cfg"
           lit -sv .upstream-tests/test -Dcompute_archs=90 -Dexecutor="NoopExecutor()" -Dstd=c++20
         shell: powershell

From 5d020b929c2d0b13954b045f6abb74d609641fd2 Mon Sep 17 00:00:00 2001
From: Wesley Maxey <71408887+wmaxey@users.noreply.github.com>
Date: Thu, 23 Mar 2023 17:54:47 -0700
Subject: [PATCH 22/28] fixup path stuff in python.

---
 .github/action-scripts/fetch-lit.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/action-scripts/fetch-lit.ps1 b/.github/action-scripts/fetch-lit.ps1
index 32245092bc..e1ed9da40e 100644
--- a/.github/action-scripts/fetch-lit.ps1
+++ b/.github/action-scripts/fetch-lit.ps1
@@ -1,4 +1,4 @@
-$python_path=(gi $($(get-command python).path)).Directory.FullName
+$python_path = "$((gi $($(get-command python).path)).Directory.FullName)"
 py -m pip install wheel
 py -m pip install lit
 

From 079f7a1c556bdb219ad7440d75c6d3dc5adb7770 Mon Sep 17 00:00:00 2001
From: Wesley Maxey <71408887+wmaxey@users.noreply.github.com>
Date: Thu, 23 Mar 2023 18:01:18 -0700
Subject: [PATCH 23/28] Try to fix error accessing var.

---
 .github/action-scripts/fetch-lit.ps1 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/action-scripts/fetch-lit.ps1 b/.github/action-scripts/fetch-lit.ps1
index e1ed9da40e..7e36b41a9a 100644
--- a/.github/action-scripts/fetch-lit.ps1
+++ b/.github/action-scripts/fetch-lit.ps1
@@ -1,6 +1,7 @@
-$python_path = "$((gi $($(get-command python).path)).Directory.FullName)"
+$LIT_PATH = "$((gi $((gcm python).path)).Directory.FullName)\Scripts"
+
 py -m pip install wheel
 py -m pip install lit
 
-$ENV:PATH="$ENV:PATH;$(python_path)\Scripts"
+$ENV:PATH="$ENV:PATH;$LIT_PATH"
 echo "PATH=$ENV:PATH" >> $ENV:GITHUB_ENV

From 259d8e6ff286552086e245628ae5bc6a8550a30a Mon Sep 17 00:00:00 2001
From: Wesley Maxey <71408887+wmaxey@users.noreply.github.com>
Date: Thu, 23 Mar 2023 18:11:55 -0700
Subject: [PATCH 24/28] Try using py instead.

---
 .github/action-scripts/fetch-lit.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/action-scripts/fetch-lit.ps1 b/.github/action-scripts/fetch-lit.ps1
index 7e36b41a9a..9f29e051b3 100644
--- a/.github/action-scripts/fetch-lit.ps1
+++ b/.github/action-scripts/fetch-lit.ps1
@@ -1,4 +1,4 @@
-$LIT_PATH = "$((gi $((gcm python).path)).Directory.FullName)\Scripts"
+$LIT_PATH = "$((gi $((gcm py).path)).Directory.FullName)\Scripts"
 
 py -m pip install wheel
 py -m pip install lit

From 83acea1ad573982baa521cffecaab90fa9e8c98b Mon Sep 17 00:00:00 2001
From: Wesley Maxey <71408887+wmaxey@users.noreply.github.com>
Date: Thu, 23 Mar 2023 18:22:21 -0700
Subject: [PATCH 25/28] Python stuff needs to be hacked around.

---
 .github/action-scripts/fetch-lit.ps1 | 6 +++---
 .github/workflows/main.yml           | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/action-scripts/fetch-lit.ps1 b/.github/action-scripts/fetch-lit.ps1
index 9f29e051b3..16fc65206a 100644
--- a/.github/action-scripts/fetch-lit.ps1
+++ b/.github/action-scripts/fetch-lit.ps1
@@ -1,7 +1,7 @@
-$LIT_PATH = "$((gi $((gcm py).path)).Directory.FullName)\Scripts"
+$LIT_PATH = "$((gi $((gcm python).path)).Directory.FullName)\Scripts"
 
-py -m pip install wheel
-py -m pip install lit
+python -m pip install wheel
+python -m pip install lit
 
 $ENV:PATH="$ENV:PATH;$LIT_PATH"
 echo "PATH=$ENV:PATH" >> $ENV:GITHUB_ENV
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 629bc1a632..33b2f87786 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -17,7 +17,8 @@ jobs:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@master
-
+      - uses: actions/setup-python@master
+      
       - name: Install Lit
         run: .github\action-scripts\fetch-lit.ps1
         shell: powershell

From a6f265f6a977502271624ab2376baac9c8abd4f5 Mon Sep 17 00:00:00 2001
From: Wesley Maxey <71408887+wmaxey@users.noreply.github.com>
Date: Thu, 23 Mar 2023 18:29:36 -0700
Subject: [PATCH 26/28] Split tests from config step.

---
 .github/workflows/main.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 33b2f87786..e4a0cb6f54 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -21,7 +21,6 @@ jobs:
       
       - name: Install Lit
         run: .github\action-scripts\fetch-lit.ps1
-        shell: powershell
 
       - name: Fetch CUDA Toolkit
         run: .github\action-scripts\fetch-cuda.ps1
@@ -36,6 +35,8 @@ jobs:
         run: |
           echo "CUDA_PATH: $ENV:CUDA_PATH"
           cmake -S ./ -B ../build -DLIBCUDACXX_ENABLE_LIBCUDACXX_TESTS=ON -DCMAKE_CXX_COMPILER=cl -DCMAKE_CUDA_COMPILER=nvcc -G Ninja
+
+      - name: Build libcudacxx tests
+        run: |
           $ENV:LIBCUDACXX_SITE_CONFIG="$(pwd)/../build/test/lit.site.cfg"
-          lit -sv .upstream-tests/test -Dcompute_archs=90 -Dexecutor="NoopExecutor()" -Dstd=c++20
-        shell: powershell
+          lit -sv .upstream-tests/test -Dcompute_archs=90 -Dexecutor="NoopExecutor()" -Dstd=c++20 -j3

From 5cd3ca569f7ff02c6f4eeb350d37560a2b3ecda4 Mon Sep 17 00:00:00 2001
From: Wesley Maxey <71408887+wmaxey@users.noreply.github.com>
Date: Thu, 23 Mar 2023 19:02:24 -0700
Subject: [PATCH 27/28] Upload a result text for the PR submitter to peruse.

---
 .github/workflows/main.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e4a0cb6f54..44f65cd78f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -39,4 +39,9 @@ jobs:
       - name: Build libcudacxx tests
         run: |
           $ENV:LIBCUDACXX_SITE_CONFIG="$(pwd)/../build/test/lit.site.cfg"
-          lit -sv .upstream-tests/test -Dcompute_archs=90 -Dexecutor="NoopExecutor()" -Dstd=c++20 -j3
+          lit --no-progress-bar -o ./lit_test_results.json -Dcompute_archs=90 -Dexecutor="NoopExecutor()" -Dstd=c++20 -j3 .upstream-tests/test
+
+      -uses: actions/upload-artifact@v3
+        with:
+          name: lit_test_results.json
+          path: ./lit_test_results.json
\ No newline at end of file

From 521b60c03e6fc38753fb5a30098692ffc03cb677 Mon Sep 17 00:00:00 2001
From: Wesley Maxey <71408887+wmaxey@users.noreply.github.com>
Date: Thu, 23 Mar 2023 19:03:42 -0700
Subject: [PATCH 28/28] Fixup typo.

---
 .github/workflows/main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 44f65cd78f..aabc3023ac 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -41,7 +41,7 @@ jobs:
           $ENV:LIBCUDACXX_SITE_CONFIG="$(pwd)/../build/test/lit.site.cfg"
           lit --no-progress-bar -o ./lit_test_results.json -Dcompute_archs=90 -Dexecutor="NoopExecutor()" -Dstd=c++20 -j3 .upstream-tests/test
 
-      -uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v3
         with:
           name: lit_test_results.json
-          path: ./lit_test_results.json
\ No newline at end of file
+          path: ./lit_test_results.json