iwyu.yml: use OpenSUSE to get latest include-what-you-use / cleaned…

… up includes (#5673) To keep with the program we have to bunny-hop to yet another distro to get the latest version of `include-what-you-use`.
danmar · Mar 8, 2024 · f465dc5 · f465dc5
1 parent 5804ef7
commit f465dc5
Show file tree

Hide file tree

Showing 76 changed files with 90 additions and 86 deletions.
diff --git a/.github/workflows/iwyu.yml b/.github/workflows/iwyu.yml
@@ -15,12 +15,12 @@ jobs:
 
     strategy:
       matrix:
-        image: ["fedora:latest"] # "debian:unstable" / "archlinux:latest"
+        image: ["opensuse/tumbleweed:latest"] # "fedora:latest" / "debian:unstable" / "archlinux:latest"
 
     runs-on: ubuntu-22.04
 
     container:
-      image: "fedora:latest"
+      image: ${{ matrix.image }}
 
     steps:
       - uses: actions/checkout@v3
@@ -60,6 +60,14 @@ jobs:
           ln -s iwyu_tool.py /usr/bin/iwyu_tool
           ln -s qt5 /usr/include/qt
 
+      - name: Install missing software on OpenSUSE
+        if: contains(matrix.image, 'opensuse')
+        run: |
+          zypper install -y cmake gcc-c++ pcre-devel libQt5Core-devel libQt5Gui-devel libQt5Widgets-devel libQt5PrintSupport-devel libqt5-linguist-devel libqt5-qttools-devel libQt5Network-devel libQt5Charts5-devel libQt5Test-devel
+          zypper install -y wget include-what-you-use-tools
+          ln -s iwyu_tool.py /usr/bin/iwyu_tool
+          ln -s qt5 /usr/include/qt          
+
       # TODO: switch to Qt 6 after we enabled the Qt mappings again
       - name: Prepare CMake
         run: |
@@ -86,7 +94,8 @@ jobs:
       - name: iwyu_tool
         run: |
           PWD=$(pwd)
-          iwyu_tool -p cmake.output -j $(nproc) -- -w -Xiwyu --max_line_length=1024 -Xiwyu --comment_style=long -Xiwyu --quoted_includes_first -Xiwyu --update_comments -Xiwyu --mapping_file=$PWD/qt5.imp -isystem/usr/lib/clang/17/include > iwyu.log
+          # -isystem/usr/lib/clang/17/include
+          iwyu_tool -p cmake.output -j $(nproc) -- -w -Xiwyu --max_line_length=1024 -Xiwyu --comment_style=long -Xiwyu --quoted_includes_first -Xiwyu --update_comments -Xiwyu --mapping_file=$PWD/qt5.imp > iwyu.log
 
       - uses: actions/upload-artifact@v3
         if: success() || failure()

diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
@@ -46,12 +46,12 @@
 #include <cstdio>
 #include <cstdlib> // EXIT_FAILURE
 #include <cstring>
-#include <fstream> // IWYU pragma: keep
+#include <fstream>
 #include <iostream>
 #include <iterator>
 #include <list>
 #include <set>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <unordered_set>
 #include <utility>
 

diff --git a/cli/cppcheckexecutor.cpp b/cli/cppcheckexecutor.cpp
@@ -44,10 +44,11 @@
 #include <cstdio>
 #include <cstdlib> // EXIT_SUCCESS and EXIT_FAILURE
 #include <ctime>
+#include <fstream>
 #include <iostream>
 #include <list>
 #include <set>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <unordered_set>
 #include <utility>
 #include <vector>

diff --git a/cli/executor.cpp b/cli/executor.cpp
@@ -25,7 +25,7 @@
 #include "suppressions.h"
 
 #include <cassert>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <utility>
 
 struct FileSettings;

diff --git a/cli/processexecutor.cpp b/cli/processexecutor.cpp
@@ -39,8 +39,9 @@
 #include <iostream>
 #include <list>
 #include <map>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <sys/select.h>
+#include <sys/time.h>
 #include <sys/wait.h>
 #include <unistd.h>
 #include <utility>

diff --git a/externals/simplecpp/simplecpp.cpp b/externals/simplecpp/simplecpp.cpp
@@ -20,13 +20,13 @@
 #include <cstring>
 #include <ctime>
 #include <exception>
-#include <fstream> // IWYU pragma: keep
+#include <fstream>
 #include <iostream>
 #include <limits>
 #include <list>
 #include <map>
 #include <set>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <stack>
 #include <stdexcept>
 #include <string>

diff --git a/gui/checkthread.cpp b/gui/checkthread.cpp
@@ -32,9 +32,9 @@
 
 #include <algorithm>
 #include <cstddef>
+#include <fstream>
 #include <iterator>
 #include <list>
-#include <ostream>
 #include <set>
 #include <string>
 #include <utility>

diff --git a/lib/analyzerinfo.cpp b/lib/analyzerinfo.cpp
@@ -25,7 +25,6 @@
 
 #include <cstring>
 #include <map>
-#include <sstream> // IWYU pragma: keep
 
 #include "xml.h"
 

diff --git a/lib/checkersreport.cpp b/lib/checkersreport.cpp
@@ -25,7 +25,6 @@
 #include <map>
 #include <sstream>
 #include <unordered_set>
-#include <utility>
 #include <vector>
 
 static bool isCppcheckPremium(const Settings& settings) {

diff --git a/lib/checkfunctions.h b/lib/checkfunctions.h
@@ -31,7 +31,6 @@
 
 #include <map>
 #include <string>
-#include <utility>
 
 class Token;
 class ErrorLogger;

diff --git a/lib/checkio.cpp b/lib/checkio.cpp
@@ -38,7 +38,7 @@
 #include <list>
 #include <map>
 #include <set>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <unordered_set>
 #include <utility>
 #include <vector>

diff --git a/lib/checkleakautovar.cpp b/lib/checkleakautovar.cpp
@@ -41,7 +41,6 @@
 #include <cstddef>
 #include <iostream>
 #include <list>
-#include <utility>
 #include <vector>
 
 //---------------------------------------------------------------------------

diff --git a/lib/checkleakautovar.h b/lib/checkleakautovar.h
@@ -30,7 +30,6 @@
 #include <map>
 #include <set>
 #include <string>
-#include <utility>
 
 class ErrorLogger;
 class Settings;

diff --git a/lib/checkuninitvar.cpp b/lib/checkuninitvar.cpp
@@ -39,7 +39,6 @@
 #include <list>
 #include <map>
 #include <unordered_set>
-#include <utility>
 #include <vector>
 
 

diff --git a/lib/checkunusedfunctions.cpp b/lib/checkunusedfunctions.cpp
@@ -34,9 +34,9 @@
 #include <algorithm>
 #include <cctype>
 #include <cstring>
-#include <fstream> // IWYU pragma: keep
+#include <fstream>
 #include <map>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <tuple>
 #include <utility>
 #include <vector>

diff --git a/lib/checkunusedvar.cpp b/lib/checkunusedvar.cpp
@@ -28,7 +28,6 @@
 #include "symboldatabase.h"
 #include "token.h"
 #include "tokenize.h"
-#include "tokenlist.h"
 #include "utils.h"
 #include "valueflow.h"
 

diff --git a/lib/clangimport.cpp b/lib/clangimport.cpp
@@ -38,7 +38,7 @@
 #include <map>
 #include <memory>
 #include <set>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <stack>
 #include <string>
 #include <utility>

diff --git a/lib/color.cpp b/lib/color.cpp
@@ -21,7 +21,7 @@
 #ifndef _WIN32
 #include <unistd.h>
 #include <cstddef>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <iostream>
 #endif
 

diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
@@ -48,12 +48,12 @@
 #include <cctype>
 #include <cstdlib>
 #include <ctime>
-#include <exception>
+#include <exception> // IWYU pragma: keep
 #include <fstream>
 #include <iostream> // <- TEMPORARY
 #include <new>
 #include <set>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <stdexcept>
 #include <string>
 #include <unordered_set>

diff --git a/lib/cppcheck.h b/lib/cppcheck.h
@@ -29,15 +29,14 @@
 #include "settings.h"
 
 #include <cstddef>
-#include <fstream> // IWYU pragma: keep
+#include <fstream>
 #include <functional>
 #include <list>
 #include <map>
 #include <memory>
 #include <set>
 #include <string>
 #include <unordered_set>
-#include <utility>
 #include <vector>
 
 class Tokenizer;

diff --git a/lib/errorlogger.cpp b/lib/errorlogger.cpp
@@ -32,8 +32,9 @@
 #include <cassert>
 #include <cctype>
 #include <cstring>
+#include <fstream>
 #include <iomanip>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <string>
 #include <unordered_map>
 #include <utility>

diff --git a/lib/fwdanalysis.cpp b/lib/fwdanalysis.cpp
@@ -28,7 +28,6 @@
 #include <list>
 #include <map>
 #include <string>
-#include <utility>
 
 static bool isUnchanged(const Token *startToken, const Token *endToken, const std::set<nonneg int> &exprVarIds, bool local)
 {

diff --git a/lib/importproject.cpp b/lib/importproject.cpp
@@ -29,10 +29,10 @@
 #include <algorithm>
 #include <cstdlib>
 #include <cstring>
-#include <fstream> // IWYU pragma: keep
+#include <fstream>
 #include <iostream>
 #include <iterator>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <unordered_set>
 #include <utility>
 

diff --git a/lib/library.cpp b/lib/library.cpp
@@ -35,7 +35,7 @@
 #include <cstring>
 #include <list>
 #include <memory>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <stack>
 #include <stdexcept>
 #include <string>

diff --git a/lib/path.cpp b/lib/path.cpp
@@ -32,6 +32,7 @@
 #include <simplecpp.h>
 
 #ifndef _WIN32
+#include <sys/types.h>
 #include <unistd.h>
 #else
 #include <direct.h>

diff --git a/lib/preprocessor.cpp b/lib/preprocessor.cpp
@@ -33,7 +33,7 @@
 #include <array>
 #include <cstddef>
 #include <iterator> // back_inserter
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <utility>
 
 #include <simplecpp.h>

diff --git a/lib/settings.cpp b/lib/settings.cpp
@@ -22,8 +22,9 @@
 #include "vfvalue.h"
 
 #include <cctype>
-#include <fstream> // IWYU pragma: keep
-#include <sstream> // IWYU pragma: keep
+#include <fstream>
+#include <sstream>
+#include <utility>
 
 #include "json.h"
 

diff --git a/lib/summaries.cpp b/lib/summaries.cpp
@@ -26,9 +26,9 @@
 #include "tokenlist.h"
 
 #include <algorithm>
-#include <fstream> // IWYU pragma: keep
+#include <fstream>
 #include <map>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <utility>
 #include <vector>
 

diff --git a/lib/suppressions.cpp b/lib/suppressions.cpp
@@ -30,7 +30,7 @@
 #include <cctype>   // std::isdigit, std::isalnum, etc
 #include <cstring>
 #include <functional> // std::bind, std::placeholders
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <utility>
 
 #include "xml.h"

diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
@@ -43,7 +43,7 @@
 #include <iomanip>
 #include <iostream>
 #include <iterator>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <stack>
 #include <string>
 #include <tuple>

diff --git a/lib/token.cpp b/lib/token.cpp
@@ -40,7 +40,7 @@
 #include <iterator>
 #include <map>
 #include <set>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <stack>
 #include <type_traits>
 #include <unordered_set>

diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -48,7 +48,7 @@
 #include <exception>
 #include <memory>
 #include <set>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <stack>
 #include <stdexcept>
 #include <unordered_map>

diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp
@@ -121,7 +121,7 @@
 #include <memory>
 #include <numeric>
 #include <set>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <string>
 #include <type_traits>
 #include <unordered_map>

diff --git a/test/helpers.cpp b/test/helpers.cpp
@@ -26,7 +26,7 @@
 #include <cerrno>
 #include <cstdio>
 #include <iostream>
-#include <fstream> // IWYU pragma: keep
+#include <fstream>
 #include <list>
 #include <map>
 #include <stdexcept>

diff --git a/test/helpers.h b/test/helpers.h
@@ -24,7 +24,7 @@
 #include "tokenlist.h"
 
 #include <cstddef>
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 #include <string>
 #include <vector>
 

diff --git a/test/test64bit.cpp b/test/test64bit.cpp
@@ -23,7 +23,7 @@
 #include "fixture.h"
 #include "tokenize.h"
 
-#include <sstream> // IWYU pragma: keep
+#include <sstream>
 
 class Test64BitPortability : public TestFixture {
 public: