Better win64 instead of win

aarcangeli · Feb 22, 2025 · 3084622 · 3084622
1 parent 07c9f3c
commit 3084622
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/.github/workflows/update-clang.yml b/.github/workflows/update-clang.yml
@@ -73,8 +73,8 @@ jobs:
           echo "::group::Download Details"
             gh release download $latest_tag --repo llvm/llvm-project --pattern "clang+llvm-*windows-msvc.tar.xz" --dir clang
             tar -xvf clang/clang+llvm-*windows-msvc.tar.xz --strip-components=2 -C clang --wildcards --no-anchored 'clang-format.exe'
-            mkdir -p src/main/resources/clang-format-win
-            mv clang/clang-format.exe src/main/resources/clang-format-win/clang-format.exe
+            mkdir -p src/main/resources/clang-format-win64
+            mv clang/clang-format.exe src/main/resources/clang-format-win64/clang-format.exe
             rm clang/clang+llvm-*
           echo "::endgroup::"
 

diff --git a/src/main/kotlin/com/github/aarcangeli/ideaclangformat/utils/ClangFormatCommons.kt b/src/main/kotlin/com/github/aarcangeli/ideaclangformat/utils/ClangFormatCommons.kt
@@ -18,7 +18,6 @@ import com.intellij.testFramework.LightVirtualFile
 import com.intellij.util.PathUtil
 import org.jetbrains.annotations.NonNls
 import java.io.File
-import java.io.InputStream
 import java.net.URL
 import java.util.regex.Pattern
 
@@ -98,7 +97,7 @@ object ClangFormatCommons {
   fun getClangFormatPath(): URL? {
     LOG.info("Loading clang-format from resources for ${SystemInfo.OS_NAME}-${SystemInfo.OS_ARCH}")
     val resourcePath = when {
-      SystemInfo.isWindows -> "/clang-format-win/clang-format.exe"
+      SystemInfo.isWindows -> "/clang-format-win64/clang-format.exe"
       SystemInfo.isLinux && SystemInfo.OS_ARCH == "arm64" -> "/clang-format-linux-arm64/clang-format"
       SystemInfo.isLinux && SystemInfo.OS_ARCH == "arm" -> "/clang-format-linux-armv7a/clang-format"
       SystemInfo.isLinux -> "/clang-format-linux-x64/clang-format"

diff --git a/...sources/clang-format-win/clang-format.exe → ...urces/clang-format-win64/clang-format.exe b/...sources/clang-format-win/clang-format.exe → ...urces/clang-format-win64/clang-format.exe