From 30846224ff0957fa5eba9f1f3074c393004174b0 Mon Sep 17 00:00:00 2001 From: Alessandro Arcangeli Date: Sat, 22 Feb 2025 19:17:37 +0100 Subject: [PATCH] Better win64 instead of win --- .github/workflows/update-clang.yml | 4 ++-- .../aarcangeli/ideaclangformat/utils/ClangFormatCommons.kt | 3 +-- .../{clang-format-win => clang-format-win64}/clang-format.exe | 0 3 files changed, 3 insertions(+), 4 deletions(-) rename src/main/resources/{clang-format-win => clang-format-win64}/clang-format.exe (100%) mode change 100755 => 100644 diff --git a/.github/workflows/update-clang.yml b/.github/workflows/update-clang.yml index c0af85d..e846793 100644 --- 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 index 1f4b55c..cde0655 100644 --- 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/src/main/resources/clang-format-win/clang-format.exe b/src/main/resources/clang-format-win64/clang-format.exe old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/clang-format-win/clang-format.exe rename to src/main/resources/clang-format-win64/clang-format.exe