use clang-7 with iwyu

etr · web-flow · commit b58331ee0dbf · 2021-02-27T20:45:05.000-08:00
diff --git a/.github/workflows/verify-build.yml b/.github/workflows/verify-build.yml
@@ -196,8 +196,8 @@ jobs:
             os: ubuntu-latest
             build-type: iwyu
             compiler-family: clang
-            c-compiler: clang
-            cc-compiler: clang++
+            c-compiler: clang-7
+            cc-compiler: clang-7++
             debug: nodebug
             coverage: nocoverage
     steps:
@@ -236,13 +236,13 @@ jobs:
 
     - name: Install IWYU if needed
       run: |
-        sudo apt-get install iwyu cmake llvm-dev libclang-dev clang-5.0 clang-6.0 clang-7 clang-8 clang-9
+        sudo apt-get install cmake llvm-dev libclang-dev clang-5.0 clang-6.0 clang-7 clang-8 clang-9
       if: ${{ matrix.build-type == 'iwyu' }}
 
     # Installing iwyu manually because clang and iwyu paths won't match on Ubuntu otherwise.
     - name: Install IWYU if requested
       run: |
-        CLANG_VERSION=`clang --version | grep version | cut -f3 -d' ' | cut -f1 -d'-'` ;
+        CLANG_VERSION=`clang-7 --version | grep version | cut -f3 -d' ' | cut -f1 -d'-'` ;
         CLANG_PKG_VERSION=`echo $CLANG_VERSION | cut -f1,2 -d'.'`
         CLANG_ROOT_PATH="/usr/lib/llvm-${CLANG_PKG_VERSION}"
         CLANG_PREFIX_PATH="${CLANG_ROOT_PATH}/lib/clang/${CLANG_VERSION}" ;
@@ -360,8 +360,7 @@ jobs:
       run: |
         cd build ;
         if [ "$BUILD_TYPE" = "iwyu" ]; then
-          strings /usr/bin/iwyu | grep LLVM ;
-          clang -print-resource-dir ;
+          clang-7 -print-resource-dir ;
           /usr/local/bin/include-what-you-use -print-resource-dir ;
           make -k CXX='/usr/local/bin/include-what-you-use -Xiwyu --mapping_file=${top_builddir}/../custom_iwyu.imp' CXXFLAGS="-std=c++11 -DHTTPSERVER_COMPILATION -D_REENTRANT $CXXFLAGS" ;
           if [ $? -ne 2 ]; then 
