Skip to content

Commit

Permalink
Merge pull request #2085 from hzeller/20240129-update-ci-tidy-format
Browse files Browse the repository at this point in the history
Use latest clang-{format,tidy} that ubuntu jammy has to offer.
  • Loading branch information
hzeller authored Jan 30, 2024
2 parents 31182be + def541f commit 8583270
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
3 changes: 2 additions & 1 deletion .github/bin/run-clang-format.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@
# limitations under the License.

set -u # only use variables once assigned
set -e # error out on error.

FORMAT_OUT=${TMPDIR:-/tmp}/clang-format-diff.out

CLANG_FORMAT_BINARY=clang-format
CLANG_FORMAT_BINARY=${CLANG_FORMAT_BINARY:-clang-format}

${CLANG_FORMAT_BINARY} --version

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/verible-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ jobs:
- name: Install Dependencies
run: |
apt -qqy update
apt -qq -y install clang-format git
clang-format --version
apt -qq -y install clang-format-15 git
clang-format-15 --version
- name: Run formatting style check
run: |
./.github/bin/run-clang-format.sh
CLANG_FORMAT_BINARY=clang-format-15 ./.github/bin/run-clang-format.sh
./.github/bin/check-potential-problems.sh
- name: 📤 Upload performance graphs
Expand Down Expand Up @@ -77,7 +77,7 @@ jobs:
- name: Install Dependencies
run: |
apt -qqy update
apt -qq -y install clang-tidy-11 clang-tidy-14 build-essential git wget
apt -qq -y install clang-tidy-11 clang-tidy-15 build-essential git wget
source ./.github/settings.sh
./.github/bin/install-bazel.sh
Expand Down Expand Up @@ -106,7 +106,7 @@ jobs:
CLANG_TIDY=clang-tidy-11 ./.github/bin/run-clang-tidy-cached.cc --checks="-*,google-runtime-references" \
|| ( cat verible_clang-tidy.out ; exit 1)
CLANG_TIDY=clang-tidy-14 ./.github/bin/run-clang-tidy-cached.cc \
CLANG_TIDY=clang-tidy-15 ./.github/bin/run-clang-tidy-cached.cc \
|| ( cat verible_clang-tidy.out ; exit 1)
- name: 📤 Upload performance graphs
Expand Down

0 comments on commit 8583270

Please sign in to comment.