Also clang-format-17 installer

rapidsai · Oct 18, 2023 · 3d86c9f · 3d86c9f
1 parent 74690a7
commit 3d86c9f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/windows/image/install-tools.ps1 b/windows/image/install-tools.ps1
@@ -13,6 +13,8 @@ Push-location "$PSScriptRoot"
 ./installers/install-cuda.ps1 -cudaVersion $cudaVersion
 ./installers/install-git.ps1
 ./installers/install-lit.ps1
+## Must be after lit installation for pip
+./installers/install-clang-format.ps1
 ./installers/install-cmake.ps1
 ./installers/install-ninja.ps1
 ./installers/install-sccache.ps1

diff --git a/windows/image/installers/install-clang-format.ps1 b/windows/image/installers/install-clang-format.ps1
@@ -0,0 +1,6 @@
+## Remove previous clang-format binary from the MSVC install
+Remove-Item -Path (gcm clang-format).Source -Force
+
+## Ensure that this runs after the lit installer so we already have pip
+python -m pip install --upgrade pip
+python -m pip install clang-format==17.*