Baymine opened a new pull request, #64497:
URL: https://github.com/apache/doris/pull/64497
Move CLANG_FORMAT resolution before the version check so that
CLANG_FORMAT_BINARY=clang-format-16 actually gets version-checked instead of
always checking the default clang-format.
### What problem does this PR solve?
Issue Number: close #xxx
Related PR: #xxx
Problem Summary:
In `build-support/clang-format.sh`, the `CLANG_FORMAT` variable (which
respects the `CLANG_FORMAT_BINARY` env var) was resolved **after** the version
check. This means the version check always ran against the default
`clang-format` in `PATH`, ignoring the `CLANG_FORMAT_BINARY` override.
For example, when a user has `clang-format` v21 in PATH (e.g. from
`ldb_toolchain`) and `clang-format-16` installed at `/usr/bin/clang-format-16`,
running:
```bash
CLANG_FORMAT_BINARY=clang-format-16 ./build-support/clang-format.sh
```
would still check the version of the default `clang-format` (v21) and fail,
even though `clang-format-16` is available and specified.
### Release note
None
### Check List (For Author)
- Test <!-- At least one of them must be included. -->
- [ ] Regression test
- [ ] Unit Test
- [x] Manual test (add detailed scripts or steps below)
- Before fix: `CLANG_FORMAT_BINARY=clang-format-16
./build-support/clang-format.sh` fails with "clang-format version is not 16"
- After fix: `CLANG_FORMAT_BINARY=clang-format-16
./build-support/clang-format.sh` correctly uses v16 and passes the version check
- [ ] No need to test or manual test. Explain why:
- [ ] This is a refactor/code format and no logic has been changed.
- [ ] Previous test can cover this change.
- [ ] No code files have been changed.
- [ ] Other reason <!-- Add your reason? -->
- Behavior changed:
- [x] No.
- [ ] Yes. <!-- Explain the behavior change -->
- Does this need documentation?
- [x] No.
- [ ] Yes. <!-- Add document PR link here. eg:
https://github.com/apache/doris-website/pull/1214 -->
### Check List (For Reviewer who merge this PR)
- [ ] Confirm the release note
- [ ] Confirm test cases
- [ ] Confirm document
- [ ] Add branch pick label <!-- Add branch pick label that this PR should
merge into -->
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]