Make formatting work in MSYS2 (#1740)

Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>

Author: jviotti

.github/workflows/ci.yml

@@ -21,74 +21,62 @@ jobs:
             type: static
             shell: sh
             benchmark: macos/llvm
-            format: true
           - os: macos-latest
             cc: clang
             cxx: clang++
             type: shared
             shell: sh
-            format: true
           - os: macos-latest
             cc: gcc-13
             cxx: g++-13
             type: static
             shell: sh
-            format: true
             benchmark: macos/gcc
           - os: ubuntu-latest
             cc: clang
             cxx: clang++
             type: static
             shell: sh
-            format: true
             benchmark: linux/llvm
           - os: ubuntu-latest
             cc: gcc
             cxx: g++
             type: static
             shell: sh
-            format: true
             benchmark: linux/gcc
           - os: ubuntu-latest
             cc: clang
             cxx: clang++
             type: shared
             shell: sh
-            format: true
           - os: ubuntu-latest
             cc: gcc
             cxx: g++
             type: shared
             shell: sh
-            format: true
           - os: windows-latest
             type: static
             shell: pwsh
-            format: true
             benchmark: windows/msvc
           - os: windows-latest
             type: shared
             shell: pwsh
-            format: true
           - os: windows-latest
             type: static
             shell: msys2 {0}
-            format: false
 
           # Sanitizers
           - os: ubuntu-latest
             cc: clang
             cxx: clang++
             type: static
             shell: sh
-            format: false
             options: -DSOURCEMETA_CORE_ADDRESS_SANITIZER:BOOL=ON
           - os: ubuntu-latest
             cc: clang
             cxx: clang++
             type: static
             shell: sh
-            format: false
             options: -DSOURCEMETA_CORE_UNDEFINED_SANITIZER:BOOL=ON
 
     defaults:
@@ -138,7 +126,6 @@ jobs:
           -DCMAKE_COMPILE_WARNING_AS_ERROR:BOOL=ON
           ${{ matrix.platform.options }}
       - run: cmake --build ./build --config Release --target clang_format_test
-        if: matrix.platform.format
       - run: cmake --build ./build --config Release --parallel 4
       - run: >
           cmake --install ./build --prefix ./build/dist --config Release --verbose

cmake/common/targets/clang-format.cmake

@@ -7,16 +7,19 @@ function(sourcemeta_target_clang_format_attempt_install)
   # See https://pypi.org/project/clang-format/
   set(CLANG_FORMAT_BINARY_VERSION "20.1.6")
   set(CLANG_FORMAT_BINARY_Windows_AMD64 "clang_format-${CLANG_FORMAT_BINARY_VERSION}-py2.py3-none-win_amd64.whl")
+  set(CLANG_FORMAT_BINARY_MSYS_x86_64 "clang_format-${CLANG_FORMAT_BINARY_VERSION}-py2.py3-none-win_amd64.whl")
   set(CLANG_FORMAT_BINARY_Darwin_arm64 "clang_format-${CLANG_FORMAT_BINARY_VERSION}-py2.py3-none-macosx_11_0_arm64.whl")
   set(CLANG_FORMAT_BINARY_Darwin_x86_64 "clang_format-${CLANG_FORMAT_BINARY_VERSION}-py2.py3-none-macosx_10_9_x86_64.whl")
   set(CLANG_FORMAT_BINARY_Linux_aarch64 "clang_format-${CLANG_FORMAT_BINARY_VERSION}-py2.py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl")
   set(CLANG_FORMAT_BINARY_Linux_x86_64 "clang_format-${CLANG_FORMAT_BINARY_VERSION}-py2.py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl")
   set(CLANG_FORMAT_BINARY_CHECKSUM_Windows_AMD64 "76/d0/2781f7699ce9ff1f5f9035d30cdb4c46f40b6acf191e0100543c289f46be")
+  set(CLANG_FORMAT_BINARY_CHECKSUM_MSYS_x86_64 "76/d0/2781f7699ce9ff1f5f9035d30cdb4c46f40b6acf191e0100543c289f46be")
   set(CLANG_FORMAT_BINARY_CHECKSUM_Darwin_arm64 "fd/27/171dcef3288369bc0f7034307cebc6ea5d9a2b03d44e5cfa5a218f0e4f53")
   set(CLANG_FORMAT_BINARY_CHECKSUM_Darwin_x86_64 "ac/f7/01502ff0869985df8b47ae62cdace425f02dfcd61b463a046f873ad5d2e2")
   set(CLANG_FORMAT_BINARY_CHECKSUM_Linux_aarch64 "b1/51/2a0f401f5a5e27f97b8ebfed6ca9c4ccc2809cabafa2f97c7ac8e5b0d882")
   set(CLANG_FORMAT_BINARY_CHECKSUM_Linux_x86_64 "b9/5e/7713e11945fa8018589e37a60052a1b1a2485be2292fcf382d154231eab6")
   set(CLANG_FORMAT_BINARY_NAME_Windows_AMD64 "clang-format.exe")
+  set(CLANG_FORMAT_BINARY_NAME_MSYS_x86_64 "clang-format.exe")
   set(CLANG_FORMAT_BINARY_NAME_Darwin_arm64 "clang-format")
   set(CLANG_FORMAT_BINARY_NAME_Darwin_x86_64 "clang-format")
   set(CLANG_FORMAT_BINARY_NAME_Linux_aarch64 "clang-format")
@@ -97,6 +100,12 @@ function(sourcemeta_target_clang_format)
     ${SOURCEMETA_TARGET_CLANG_FORMAT_SOURCES})
 
   set(CLANG_FORMAT_CONFIG "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/clang-format.config")
+  if(CMAKE_SYSTEM_NAME STREQUAL "MSYS")
+    # Because `clang-format` is typically a Windows `.exe`, transform the path accordingly
+    execute_process(COMMAND cygpath -w "${CLANG_FORMAT_CONFIG}"
+      OUTPUT_VARIABLE CLANG_FORMAT_CONFIG OUTPUT_STRIP_TRAILING_WHITESPACE)
+  endif()
+
   if(CLANG_FORMAT_BIN)
     message(STATUS "Using `clang-format` from ${CLANG_FORMAT_BIN}")
     add_custom_target(clang_format