Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions .github/workflows/python-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
needs: [build]
strategy:
matrix:
version: [ 3.9, 4, 5, 6, 7, 8, 9, 10, 11, 12, 12.0.1, 13, 14, 15, 16 ]
version: [ 3.9, 4, 5, 6, 7, 8, 9, 10, 11, 12, 12.0.1, 13, 14, 15, 16, 17 ]
os: [ ubuntu-latest, macos-latest, windows-latest ]
fail-fast: false
runs-on: ${{ matrix.os }}
Expand All @@ -87,35 +87,35 @@ jobs:
- name: Show path of binaries
shell: bash
run: |
if [ "${{ matrix.version }}" = "15" -a "${{ matrix.os }}" = "windows-latest" ]; then
which clang-format
which clang-tidy
elif [ "${{ matrix.version }}" = "12.0.1" -a "${{ matrix.os }}" = "ubuntu-latest" ]; then
which clang-format-12
which clang-tidy-12
else
which clang-format-${{ matrix.version }}
which clang-tidy-${{ matrix.version }}
if [ "${{ matrix.version }}" = "15" -o "${{ matrix.version }}" = "16" ] && [ "${{ matrix.os }}" = "windows-latest" ]; then
which clang-format
which clang-tidy
elif [ "${{ matrix.os }}" = "ubuntu-latest" ]; then
which "clang-format-${{ matrix.version }}"
which "clang-tidy-${{ matrix.version }}"
fi

- name: Check clang-tools on Windows
if: matrix.os == 'windows-latest'
shell: bash
run: |
if [ "${{ matrix.version }}" = "15" ]; then
clang-format.exe --version
clang-tidy.exe --version
else
clang-format-${{ matrix.version }}.exe --version
clang-tidy-${{ matrix.version }}.exe --version
fi
case "${{ matrix.version }}" in
15|16)
clang-format.exe --version
clang-tidy.exe --version
;;
*)
clang-format-${{ matrix.version }}.exe --version
clang-tidy-${{ matrix.version }}.exe --version
;;
esac

- name: Check clang-tools on Unix
if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest'
run: |
if [ "${{ matrix.version }}" = "12.0.1" -a "${{ matrix.os }}" = "ubuntu-latest" ]; then
clang-format-12 --version
clang-tidy-12 --version
clang-format-12.0.1 --version
clang-tidy-12.0.1 --version
else
clang-format-${{ matrix.version }} --version
case "${{ matrix.version }}" in
Expand Down
18 changes: 9 additions & 9 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -124,27 +124,27 @@ Supported versions
clang-format
************
.. csv-table::
:header: "Version", "16", "15", "14", "13", "12", "11", "10", "9", "8", "7", "6", "5", "4", "3.9"
:header: "Version", "17", "16", "15", "14", "13", "12", "11", "10", "9", "8", "7", "6", "5", "4", "3.9"
:stub-columns: 1

Linux,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️
Windows,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️
macOS,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️
Linux,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️
Windows,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️
macOS,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️

clang-tidy
**********
.. csv-table::
:header: "Version", "16", "15", "14", "13", "12", "11", "10", "9", "8", "7", "6", "5", "4", "3.9"
:header: "Version", "17", "16", "15", "14", "13", "12", "11", "10", "9", "8", "7", "6", "5", "4", "3.9"
:stub-columns: 1

Linux,❌,❌,❌,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️
Windows,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️
macOS,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️
Linux,✔️,❌,❌,❌,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️
Windows,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️
macOS,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️,✔️

Know issues:

1. clang-tidy-14, clang-tidy-15 and clang-tidy-16 has Segmentation fault on Ubuntu 22.02.
2. clang-tidy-14, clang-tidy-15 and clang-tidy-16 is over 1 GB for MacOSX
2. clang-tidy-14, clang-tidy-15, clang-tidy-16, clang-tidy-17 is over 1 GB for MacOSX

Thanks to the project
`clang-tools-static-binaries <https://github.com/muttleyxd/clang-tools-static-binaries>`_
Expand Down
2 changes: 1 addition & 1 deletion clang_tools/install.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def is_installed(tool_name: str, version: str) -> Optional[Path]:


def clang_tools_binary_url(
tool: str, version: str, release_tag: str = "master-9ba48406"
tool: str, version: str, release_tag: str = "master-8f72ab3c"
) -> str:
"""Assemble the URL to the binary.

Expand Down
2 changes: 1 addition & 1 deletion tests/clang-query-12_linux-amd64.sha512sum
Original file line number Diff line number Diff line change
@@ -1 +1 @@
bd1492a81d05d5fa13457e11b75b73bf4a02213b14daf2a956dc7413b0cf1f47de4c4e96e15139a09cdaae1152d47b5dd9cab43fdbe993d58161636ca2e8a33e clang-query-12_linux-amd64
02c62a5916e669bff34a2777874912a0e84556df448b7c690b4e9fe3e429dd29e0b8195124cc3e1b16b0ee3271391c865c040707d32c9ccfc45737a5673fc385 clang-query-12_linux-amd64
4 changes: 2 additions & 2 deletions tests/test_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def test_check_install_os():


@pytest.mark.parametrize(
"tag", ["master-9ba48406", pytest.param("latest", marks=pytest.mark.xfail)]
"tag", ["master-8f72ab3c", pytest.param("latest", marks=pytest.mark.xfail)]
)
def test_download_file(monkeypatch: pytest.MonkeyPatch, tmp_path: Path, tag: str):
"""Test that deliberately fails to download a file."""
Expand All @@ -30,5 +30,5 @@ def test_get_sha(monkeypatch: pytest.MonkeyPatch):
expected = Path(f"clang-query-12_{install_os}-amd64.sha512sum").read_text(
encoding="utf-8"
)
url = clang_tools_binary_url("clang-query", "12", release_tag="master-9ba48406")
url = clang_tools_binary_url("clang-query", "12", release_tag="master-8f72ab3c")
assert get_sha_checksum(url) == expected