diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8f754a2bc..6f8cd4573 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -51,7 +51,7 @@ jobs: - name: Bootstrap run: | sudo rm /etc/apt/sources.list.d/* && sudo apt-get update - sudo apt-get --no-install-recommends install -y clang-format-14 clang-tidy-9 shellcheck + sudo apt-get --no-install-recommends install -y clang-format-14 clang-tidy-14 shellcheck python3 -m pip install yapf==0.31.0 sudo snap install shfmt - name: Check @@ -112,7 +112,7 @@ jobs: script/test package scan-build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 with: @@ -120,7 +120,7 @@ jobs: - name: Bootstrap run: | sudo rm /etc/apt/sources.list.d/* && sudo apt-get update - sudo apt-get --no-install-recommends install -y clang-tools-9 ninja-build + sudo apt-get --no-install-recommends install -y clang-tools-14 ninja-build - name: Run run: | script/check-scan-build diff --git a/script/bootstrap b/script/bootstrap index d25f3d2db..e1d662bbd 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -38,7 +38,7 @@ install_packages_pretty_format() echo 'Installing pretty tools useful for code contributions...' # add clang-format and clang-tidy for pretty - sudo apt-get --no-install-recommends install -y clang-format-14 clang-tidy-9 || echo 'WARNING: could not install clang-format-14 and clang-tidy-9, which is useful if you plan to contribute C/C++ code to the OpenThread project.' + sudo apt-get --no-install-recommends install -y clang-format-14 clang-tidy-14 || echo 'WARNING: could not install clang-format-14 and clang-tidy-14, which is useful if you plan to contribute C/C++ code to the OpenThread project.' # add yapf for pretty python3 -m pip install yapf==0.31.0 || echo 'WARNING: could not install yapf, which is useful if you plan to contribute python code to the OpenThread project.' diff --git a/script/check-scan-build b/script/check-scan-build index 0a18b9f93..bc672d351 100755 --- a/script/check-scan-build +++ b/script/check-scan-build @@ -88,8 +88,8 @@ main() mkdir -p build cd build - scan-build-9 cmake -GNinja -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DOT_COMPILE_WARNING_AS_ERROR=ON -DCMAKE_C_FLAGS="${OT_CFLAGS[*]}" -DCMAKE_CXX_FLAGS="${OT_CFLAGS[*]}" "${OT_BUILD_OPTIONS[@]}" "${OT_SRCDIR}" - scan-build-9 --status-bugs -analyze-headers -v ninja + scan-build-14 cmake -GNinja -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DOT_COMPILE_WARNING_AS_ERROR=ON -DCMAKE_C_FLAGS="${OT_CFLAGS[*]}" -DCMAKE_CXX_FLAGS="${OT_CFLAGS[*]}" "${OT_BUILD_OPTIONS[@]}" "${OT_SRCDIR}" + scan-build-14 --status-bugs -analyze-headers -v ninja cd "${OT_SRCDIR}" } diff --git a/script/clang-tidy b/script/clang-tidy index b2dfb4d4d..c46080926 100755 --- a/script/clang-tidy +++ b/script/clang-tidy @@ -27,8 +27,8 @@ # POSSIBILITY OF SUCH DAMAGE. # -CLANG_TIDY_VERSION="LLVM version 9.0" -CLANG_APPLY_REPLACEMENTS_VERSION="clang-apply-replacements version 9.0" +CLANG_TIDY_VERSION="LLVM version 14.0" +CLANG_APPLY_REPLACEMENTS_VERSION="clang-apply-replacements version 14.0" die() { @@ -36,9 +36,9 @@ die() exit 1 } -# Search for clang-tidy-9 -if command -v clang-tidy-9 >/dev/null; then - clang_tidy=$(command -v clang-tidy-9) +# Search for clang-tidy-14 +if command -v clang-tidy-14 >/dev/null; then + clang_tidy=$(command -v clang-tidy-14) elif command -v clang-tidy >/dev/null; then clang_tidy=$(command -v clang-tidy) case "$($clang_tidy --version)" in @@ -49,12 +49,12 @@ elif command -v clang-tidy >/dev/null; then ;; esac else - die "clang-tidy 9.0 required" + die "clang-tidy 14.0 required" fi -# Search for clang-apply-replacements-9 -if command -v clang-apply-replacements-9 >/dev/null; then - clang_apply_replacements=$(command -v clang-apply-replacements-9) +# Search for clang-apply-replacements-14 +if command -v clang-apply-replacements-14 >/dev/null; then + clang_apply_replacements=$(command -v clang-apply-replacements-14) elif command -v clang-apply-replacements >/dev/null; then clang_apply_replacements=$(command -v clang-apply-replacements) case "$($clang_apply_replacements --version)" in @@ -65,20 +65,20 @@ elif command -v clang-apply-replacements >/dev/null; then ;; esac else - die "clang-apply-replacements 9.0 required" + die "clang-apply-replacements 14.0 required" fi -# Search for run-clang-tidy-9.py -if command -v run-clang-tidy-9.py >/dev/null; then - run_clang_tidy=$(command -v run-clang-tidy-9.py) -elif command -v run-clang-tidy-9 >/dev/null; then - run_clang_tidy=$(command -v run-clang-tidy-9) +# Search for run-clang-tidy-14.py +if command -v run-clang-tidy-14.py >/dev/null; then + run_clang_tidy=$(command -v run-clang-tidy-14.py) +elif command -v run-clang-tidy-14 >/dev/null; then + run_clang_tidy=$(command -v run-clang-tidy-14) elif command -v run-clang-tidy.py >/dev/null; then run_clang_tidy=$(command -v run-clang-tidy.py) elif command -v run-clang-tidy >/dev/null; then run_clang_tidy=$(command -v run-clang-tidy) else - die "run-clang-tidy.py 9.0 required" + die "run-clang-tidy.py 14.0 required" fi $run_clang_tidy -clang-tidy-binary "$clang_tidy" -clang-apply-replacements-binary "$clang_apply_replacements" "$@" || die