Skip to content

Commit

Permalink
[test][cfg] Use clang-13 in the CI, uplift tests accordingly
Browse files Browse the repository at this point in the history
  • Loading branch information
Balazs Benics committed Nov 2, 2021
1 parent 4be1eca commit fe83845
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/install-deps.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
sudo add-apt-repository 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-11 main' -y
sudo add-apt-repository 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-13 main' -y

sudo apt-get update -q

Expand All @@ -13,9 +13,9 @@ sudo apt-get install \
libldap2-dev \
libsasl2-dev \
libssl-dev \
clang-11 \
clang-tidy-11
clang-13 \
clang-tidy-13

sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-11 9999
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-11 9999
sudo update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-11 9999
sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-13 9999
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-13 9999
sudo update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-13 9999
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ compiler_warning_unused:
compiler_error:
$(CXX) -w compiler_error.cpp -o /dev/null
context_hash:
$(CXX) -w context_hash.cpp -o /dev/null
$(CXX) -w context_hash.cpp -Wno-unused-but-set-variable -Wno-unused-but-set-parameter -o /dev/null
collision:
$(CXX) -w filename_collision/main.cpp filename_collision/a/f.cpp filename_collision/b/f.cpp -o /dev/null
tidy_alias:
Expand Down
4 changes: 2 additions & 2 deletions scripts/test/check_clang.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
import sys

# clang an clang tidy versions to run the tests
_CLANG_MIN_VERSION = {"major": 11, "minor": 0}
_TIDY_MIN_VERSION = {"major": 11, "minor": 0}
_CLANG_MIN_VERSION = {"major": 13, "minor": 0}
_TIDY_MIN_VERSION = {"major": 13, "minor": 0}


def eprint(*args, **kwargs):
Expand Down

0 comments on commit fe83845

Please sign in to comment.