feat: support clang version 21 and macOS arm64 (#149)

shenxianpeng · web-flow · commit f394e9ec520d · 2026-03-03T20:38:52.000+02:00
* chore: Update supported Clang versions 21 and binary tag in configuration

* chore: Update SHA512 checksums for clang-format-21 binaries

* feat: Enhance installation logic for macOS architecture support and update tests

* style: Refactor import statements and format platform string assignment for clarity
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -74,8 +74,8 @@ jobs:
     needs: [build]
     strategy:
       matrix:
-        version: [ 9, 10, 11, 12, 12.0.1, 13, 14, 15, 16, 17, 18, 19, 20, 21 ]
-        os: [ ubuntu-latest, macos-latest, windows-latest ]
+        version: [ 11, 12, 12.0.1, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22 ]
+        os: [ ubuntu-latest, macos-15-intel, macos-latest, windows-latest ]
       fail-fast: false
     runs-on: ${{ matrix.os }}
     steps:
@@ -101,12 +101,12 @@ jobs:
       - name: Show path of clang-tools binaries
         shell: bash
         run: |
-          if [ "${{ matrix.version }}" = "15" -o "${{ matrix.version }}" = "16" ] && [ "${{ matrix.os }}" = "windows-latest" ]; then
+          if [ "${{ matrix.version }}" = "15" -o "${{ matrix.version }}" = "16" ] && [ "${{ runner.os }}" = "Windows" ]; then
               which clang-format
               which clang-tidy
               which clang-query
               which clang-apply-replacements
-          elif [ "${{ matrix.os }}" = "ubuntu-latest" ]; then
+          elif [ "${{ runner.os }}" = "Linux" ] || [ "${{ runner.os }}" = "macOS" ]; then
               which "clang-format-${{ matrix.version }}"
               which "clang-tidy-${{ matrix.version }}"
               which "clang-query-${{ matrix.version }}"
@@ -118,7 +118,7 @@ jobs:
         shell: bash
         run: |
           case "${{ matrix.version }}" in
-            15|16|18|20|21)
+            15|16|18|20|21|22)
               clang-format.exe --version
               clang-tidy.exe --version
               clang-query.exe --version
@@ -133,9 +133,9 @@ jobs:
           esac
 
       - name: Check clang-tools binaries on Unix
-        if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest'
+        if: runner.os == 'Linux' || runner.os == 'macOS'
         run: |
-          if [ "${{ matrix.version }}" = "12.0.1" -a "${{ matrix.os }}" = "ubuntu-latest" ]; then
+          if [ "${{ matrix.version }}" = "12.0.1" -a "${{ runner.os }}" = "Linux" ]; then
             clang-format-12.0.1 --version
             clang-tidy-12.0.1 --version
             clang-query-12.0.1 --version
diff --git a/README.rst b/README.rst
@@ -168,12 +168,12 @@ clang tools binaries
 The following table shows the supported versions of clang-format, clang-tidy, clang-query, and clang-apply-replacements binaries for each platform:
 
 .. csv-table::
-    :header: "Platform", "21", "20", "19", "18", "17", "16", "15", "14", "13", "12", "11", "10", "9"
+    :header: "Platform", "22", "21", "20", "19", "18", "17", "16", "15", "14", "13", "12", "11"
     :stub-columns: 1
 
-    Linux,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️
-    Windows,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️
-    macOS,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️
+    Linux,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️
+    Windows,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️
+    macOS,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️
 
 For more details, visit the `clang-tools-static-binaries <https://github.com/cpp-linter/clang-tools-static-binaries>`_ repository.
 
diff --git a/clang_tools/__init__.py b/clang_tools/__init__.py
@@ -1,15 +1,16 @@
 """The clang-tools package's base module."""
 
 import os
-from .util import check_install_os
+from .util import check_install_arch, check_install_os
 
 
 RESET_COLOR = "\033[0m"
 YELLOW = "\033[93m"
 install_os = check_install_os()
+install_arch = check_install_arch()
 suffix = ".exe" if install_os == "windows" else ""
 
 binary_repo = os.getenv(
     "CLANG_TOOLS_REPO", "https://github.com/cpp-linter/clang-tools-static-binaries"
 )
-binary_tag = os.getenv("CLANG_TOOLS_TAG", "master-6e612956")
+binary_tag = os.getenv("CLANG_TOOLS_TAG", "master-63858060")
diff --git a/clang_tools/install.py b/clang_tools/install.py
@@ -13,7 +13,15 @@
 import sys
 from typing import Optional, cast
 
-from . import binary_repo, binary_tag, install_os, RESET_COLOR, suffix, YELLOW
+from . import (
+    binary_repo,
+    binary_tag,
+    install_arch,
+    install_os,
+    RESET_COLOR,
+    suffix,
+    YELLOW,
+)
 from .util import download_file, verify_sha512, get_sha_checksum, Version
 
 
@@ -73,7 +81,13 @@ def clang_tools_binary_url(tool: str, version: str) -> str:
     :returns: The URL used to download the specified tool.
     """
     base_url = f"{binary_repo}/releases/download/" + binary_tag
-    download_url = f"{base_url}/{tool}-{version}_{install_os}-amd64{suffix}"
+    if install_os == "macosx":
+        platform_str = (
+            "macosx-arm64" if install_arch == "arm64" else "macos-intel-amd64"
+        )
+    else:
+        platform_str = f"{install_os}-amd64"
+    download_url = f"{base_url}/{tool}-{version}_{platform_str}{suffix}"
     return download_url.replace(" ", "")
 
 
diff --git a/clang_tools/util.py b/clang_tools/util.py
@@ -14,6 +14,17 @@
 from http.client import HTTPResponse
 
 
+def check_install_arch() -> str:
+    """Identify the CPU architecture.
+
+    :returns: ``"arm64"`` for ARM processors, ``"amd64"`` otherwise.
+    """
+    machine = platform.machine().lower()
+    if machine in ("arm64", "aarch64"):
+        return "arm64"
+    return "amd64"
+
+
 def check_install_os() -> str:
     """Identify this Operating System.
 
diff --git a/tests/clang-format-21_linux-amd64.sha512sum b/tests/clang-format-21_linux-amd64.sha512sum
@@ -1 +1 @@
-c399d13b5cd5b7cb718773009ec656cf1e402e6a95eb931b5db0cc71235fa18e6fcfe63519393d977d0457de1737f5c9f5a7d6cff57eb1e678780b85768d67b7  clang-format-21_linux-amd64
+d108785107539ada648fbe2569dd1454661df9f6c7b200b75e7a19f0cbaee283f2f64e4abc5513ccb5822d4f02a1b3e7b14f21cd106a2f301384fbeda1d60591  clang-format-21_linux-amd64
diff --git a/tests/clang-format-21_macos-intel-amd64.sha512sum b/tests/clang-format-21_macos-intel-amd64.sha512sum
@@ -0,0 +1 @@
+bffb86ca1278b0fe316eeac4955dc8847f8589c09dad683ae58107ddcc08b978b0fbfe551eb71918c146ca83dc17f6e309b957716f0ed3795c785cec9b213055  clang-format-21_macos-intel-amd64
diff --git a/tests/clang-format-21_macosx-amd64.sha512sum b/tests/clang-format-21_macosx-amd64.sha512sum
diff --git a/tests/clang-format-21_macosx-arm64.sha512sum b/tests/clang-format-21_macosx-arm64.sha512sum
@@ -0,0 +1 @@
+205860a9e39d9145444e6fcd356efd03d5b8051ed65b3a834f9688b4d38477cb38c1689eca5b5d8a465770fd7437ff7052b53c08b25bc5e2cecb118d6fcb5f57  clang-format-21_macosx-arm64
diff --git a/tests/clang-format-21_windows-amd64.sha512sum b/tests/clang-format-21_windows-amd64.sha512sum
@@ -1 +1 @@
-40c290a38318fcaa28c83bc86fb8f465f1c748f7f93405ec19653fe99e58b54d71eab228065be36b7bd031dd63a8ed595ff6a909a883f06cad9300b6cb632a2e *clang-format-21_windows-amd64
+39ff0df4cbb2f4b198e8ce1717765fd594809f394c05391cf1591a0e20e49e136c6f332ce37c660c99c9f5561b38d6579d680e797587267a789e3b84aa0328c7 *clang-format-21_windows-amd64
diff --git a/tests/test_install.py b/tests/test_install.py
@@ -3,7 +3,7 @@
 from pathlib import PurePath, Path
 import os
 import pytest
-from clang_tools import install_os, suffix
+from clang_tools import install_arch, install_os, suffix
 from clang_tools.install import (
     clang_tools_binary_url,
     install_dir_name,
@@ -24,7 +24,13 @@
 def test_clang_tools_binary_url(tool_name: str, version: str):
     """Test `clang_tools_binary_url()`"""
     url = clang_tools_binary_url(tool_name, version)
-    assert f"{tool_name}-{version}_{install_os}-amd64" in url
+    if install_os == "macosx":
+        if install_arch == "arm64":
+            assert f"{tool_name}-{version}_macosx-arm64" in url
+        else:
+            assert f"{tool_name}-{version}_macos-intel-amd64" in url
+    else:
+        assert f"{tool_name}-{version}_{install_os}-amd64" in url
 
 
 @pytest.mark.parametrize("directory", ["", "."])
diff --git a/tests/test_util.py b/tests/test_util.py
@@ -2,9 +2,15 @@
 
 from pathlib import Path, PurePath
 import pytest
-from clang_tools import install_os
+from clang_tools import install_arch, install_os
 from clang_tools.install import clang_tools_binary_url
-from clang_tools.util import check_install_os, download_file, get_sha_checksum, Version
+from clang_tools.util import (
+    check_install_arch,
+    check_install_os,
+    download_file,
+    get_sha_checksum,
+    Version,
+)
 
 
 def test_check_install_os():
@@ -13,6 +19,12 @@ def test_check_install_os():
     assert current_os in ("linux", "windows", "macosx")
 
 
+def test_check_install_arch():
+    """Tests the return value of `check_install_arch()`."""
+    current_arch = check_install_arch()
+    assert current_arch in ("amd64", "arm64")
+
+
 def test_download_file(monkeypatch: pytest.MonkeyPatch, tmp_path: Path):
     """Test that deliberately fails to download a file."""
     monkeypatch.chdir(str(tmp_path))
@@ -25,7 +37,13 @@ def test_get_sha(monkeypatch: pytest.MonkeyPatch):
     """Test the get_sha() function used to fetch the
     releases' corresponding SHA512 checksum."""
     monkeypatch.chdir(PurePath(__file__).parent.as_posix())
-    expected = Path(f"clang-format-21_{install_os}-amd64.sha512sum").read_text(
+    if install_os == "macosx":
+        platform_str = (
+            "macosx-arm64" if install_arch == "arm64" else "macos-intel-amd64"
+        )
+    else:
+        platform_str = f"{install_os}-amd64"
+    expected = Path(f"clang-format-21_{platform_str}.sha512sum").read_text(
         encoding="utf-8"
     )
     url = clang_tools_binary_url("clang-format", "21")

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-c399d13b5cd5b7cb718773009ec656cf1e402e6a95eb931b5db0cc71235fa18e6fcfe63519393d977d0457de1737f5c9f5a7d6cff57eb1e678780b85768d67b7 clang-format-21_linux-amd64`
	`1`	`+d108785107539ada648fbe2569dd1454661df9f6c7b200b75e7a19f0cbaee283f2f64e4abc5513ccb5822d4f02a1b3e7b14f21cd106a2f301384fbeda1d60591 clang-format-21_linux-amd64`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+bffb86ca1278b0fe316eeac4955dc8847f8589c09dad683ae58107ddcc08b978b0fbfe551eb71918c146ca83dc17f6e309b957716f0ed3795c785cec9b213055 clang-format-21_macos-intel-amd64`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+205860a9e39d9145444e6fcd356efd03d5b8051ed65b3a834f9688b4d38477cb38c1689eca5b5d8a465770fd7437ff7052b53c08b25bc5e2cecb118d6fcb5f57 clang-format-21_macosx-arm64`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-40c290a38318fcaa28c83bc86fb8f465f1c748f7f93405ec19653fe99e58b54d71eab228065be36b7bd031dd63a8ed595ff6a909a883f06cad9300b6cb632a2e *clang-format-21_windows-amd64`
	`1`	`+39ff0df4cbb2f4b198e8ce1717765fd594809f394c05391cf1591a0e20e49e136c6f332ce37c660c99c9f5561b38d6579d680e797587267a789e3b84aa0328c7 *clang-format-21_windows-amd64`