Skip to content

Commit 6df3a07

Browse files
committed
Switch clang tools from static binaries to wheels
1 parent 12018a1 commit 6df3a07

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

README.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -188,13 +188,12 @@ Otherwise, [nushell] and/or the LLVM-provided bash script will fail to run.
188188
### On macOS runners
189189

190190
The specified `version` of `clang-format` and `clang-tidy` is installed via Homebrew.
191-
Failing that, we attempt to use static binaries that we built ourselves;
192-
see [cpp-linter/clang-tools-pip] and [cpp-linter/clang-tools-static-binaries] projects for more detail.
191+
Failing that, we attempt to use Python wheel that we built ourselves; see [cpp-linter/clang-tools-pip] project for more detail.
193192

194193
### On Windows runners
195194

196-
For Windows runners, we only use clang tools built as static binaries.
197-
See [cpp-linter/clang-tools-pip] and [cpp-linter/clang-tools-static-binaries] projects for more detail.
195+
For Windows runners, we only use clang tools Python wheels.
196+
See [cpp-linter/clang-tools-pip] project for more detail.
198197

199198
## License
200199

@@ -203,7 +202,6 @@ The scripts and documentation in this project are released under the [MIT Licens
203202
[nushell]: https://www.nushell.sh/
204203
[uv]: https://docs.astral.sh/uv/
205204
[cpp-linter/clang-tools-pip]: https://github.com/cpp-linter/clang-tools-pip
206-
[cpp-linter/clang-tools-static-binaries]: https://github.com/cpp-linter/clang-tools-static-binaries
207205
[gh-container-syntax]: https://docs.github.com/en/actions/reference/workflows-and-actions/workflow-syntax#jobsjob_idcontainer
208206

209207
<!--README-end-->

action.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ inputs:
4040
description: |
4141
The desired version of the [clang-tools](https://github.com/cpp-linter/clang-tools-pip) to use.
4242
Accepted options are strings which can be 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10 or 9.
43+
clang-tidy only supports versions 13 and above.
4344
4445
- Set this option to a blank string (`''`) to use the platform's default installed version.
4546
- This value can also be a path to where the clang tools are installed (if using a custom install location).
@@ -377,7 +378,7 @@ runs:
377378
^$'($env.UV_INSTALL_DIR)/uv' ...$uv_args
378379
379380
print $"\n(ansi purple)Ensuring clang-format and clang-tidy ${{ inputs.version }} are present(ansi reset)"
380-
let cmd = [clang-tools -i ${{ inputs.version }} -b]
381+
let cmd = [clang-tools-wheel --tool clang-format --version ${{ inputs.version }}, clang-tools-wheel --tool clang-tidy --version ${{ inputs.version }}]
381382
$uv_args = [run --no-sync --project $action_path --directory (pwd)]
382383
if $verbosity {
383384
$uv_args = $uv_args | append '-v'

0 commit comments

Comments
 (0)