Skip to content

Commit 18db69c

Browse files
firewavefirewave
authored
enabled Boost usage in optimized CI builds (cppcheck-opensource#4512)
1 parent cab4997 commit 18db69c

7 files changed

Lines changed: 19 additions & 12 deletions

File tree

‎.github/workflows/CI-unixish.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -444,13 +444,13 @@ jobs:
444444
- name: Install missing software on ubuntu
445445
run: |
446446
sudo apt-get update
447-
sudo apt-get install qtbase5-dev qttools5-dev libqt5charts5-dev
447+
sudo apt-get install qtbase5-dev qttools5-dev libqt5charts5-dev libboost-container-dev
448448
449449
- name: Self check (build)
450450
run: |
451451
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
452452
# compile with verification and ast matchers
453-
make -j$(nproc) -s CPPFLAGS="-DCHECK_INTERNAL" CXXFLAGS="-g -O2" MATCHCOMPILER=yes VERIFY=1
453+
make -j$(nproc) -s CPPFLAGS="-DCHECK_INTERNAL" CXXFLAGS="-g -O2 -DHAVE_BOOST" MATCHCOMPILER=yes VERIFY=1
454454
455455
- name: Generate UI files
456456
run: |

‎.github/workflows/asan.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Install missing software on ubuntu
2727
run: |
2828
sudo apt-get update
29-
sudo apt-get install -y cmake make libpcre3-dev
29+
sudo apt-get install -y cmake make libpcre3-dev libboost-container-dev
3030
3131
- name: Install clang
3232
run: |
@@ -36,7 +36,7 @@ jobs:
3636
3737
- name: CMake
3838
run: |
39-
cmake -S . -B cmake.output -DCMAKE_BUILD_TYPE=RelWithDebInfo -DHAVE_RULES=On -DBUILD_TESTS=On -DUSE_MATCHCOMPILER=Verify -DANALYZE_ADDRESS=On -DENABLE_CHECK_INTERNAL=On -DCPPCHK_GLIBCXX_DEBUG=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On
39+
cmake -S . -B cmake.output -DCMAKE_BUILD_TYPE=RelWithDebInfo -DHAVE_RULES=On -DBUILD_TESTS=On -DUSE_MATCHCOMPILER=Verify -DANALYZE_ADDRESS=On -DENABLE_CHECK_INTERNAL=On -DUSE_BOOST=On -DCPPCHK_GLIBCXX_DEBUG=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On
4040
env:
4141
CC: clang-15
4242
CXX: clang++-15

‎.github/workflows/release-windows.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ jobs:
9797
del Build\gui\cppcheck-gui.ilk || exit /b !errorlevel!
9898
del Build\gui\cppcheck-gui.pdb || exit /b !errorlevel!
9999
100+
# TODO: build with boost enabled
100101
- name: Build CLI x64 release configuration using MSBuild
101102
run: msbuild -m cppcheck.sln -t:cli -p:Configuration=Release-PCRE -p:Platform=x64 || exit /b !errorlevel!
102103

‎.github/workflows/selfcheck.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@ jobs:
1818
steps:
1919
- uses: actions/checkout@v2
2020

21+
- name: Install missing software
22+
run: |
23+
sudo apt-get update
24+
sudo apt-get install libboost-container-dev
25+
2126
- name: ccache
2227
uses: hendrikmuhs/[email protected]
2328
with:
@@ -41,7 +46,7 @@ jobs:
4146
- name: Self check (build)
4247
run: |
4348
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
44-
make -j$(nproc) -s CXXFLAGS="-O2 -w" MATCHCOMPILER=yes
49+
make -j$(nproc) -s CXXFLAGS="-O2 -w -DHAVE_BOOST" MATCHCOMPILER=yes
4550
4651
- name: CMake
4752
run: |
@@ -67,7 +72,7 @@ jobs:
6772
# the following steps are duplicated from above since setting up the build node in a parallel step takes longer than the actual steps
6873
- name: CMake (no test)
6974
run: |
70-
cmake -S . -B cmake.output.notest -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=0 -DBUILD_GUI=ON -DWITH_QCHART=ON -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On
75+
cmake -S . -B cmake.output.notest -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=Off -DBUILD_GUI=ON -DWITH_QCHART=ON -DENABLE_CHECK_INTERNAL=On -DCMAKE_GLOBAL_AUTOGEN_TARGET=On
7176
7277
- name: Generate dependencies (no test)
7378
run: |

‎.github/workflows/tsan.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Install missing software on ubuntu
2727
run: |
2828
sudo apt-get update
29-
sudo apt-get install -y cmake make libpcre3-dev
29+
sudo apt-get install -y cmake make libpcre3-dev libboost-container-dev
3030
3131
- name: Install clang
3232
run: |
@@ -36,7 +36,7 @@ jobs:
3636
3737
- name: CMake
3838
run: |
39-
cmake -S . -B cmake.output -DCMAKE_BUILD_TYPE=RelWithDebInfo -DHAVE_RULES=On -DBUILD_TESTS=On -DUSE_MATCHCOMPILER=Verify -DANALYZE_THREAD=On -DUSE_THREADS=On -DENABLE_CHECK_INTERNAL=On -DCPPCHK_GLIBCXX_DEBUG=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On
39+
cmake -S . -B cmake.output -DCMAKE_BUILD_TYPE=RelWithDebInfo -DHAVE_RULES=On -DBUILD_TESTS=On -DUSE_MATCHCOMPILER=Verify -DANALYZE_THREAD=On -DUSE_THREADS=On -DENABLE_CHECK_INTERNAL=On -DUSE_BOOST=On -DCPPCHK_GLIBCXX_DEBUG=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On
4040
env:
4141
CC: clang-15
4242
CXX: clang++-15

‎.github/workflows/ubsan.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Install missing software on ubuntu
2727
run: |
2828
sudo apt-get update
29-
sudo apt-get install -y cmake make libpcre3-dev
29+
sudo apt-get install -y cmake make libpcre3-dev libboost-container-dev
3030
3131
- name: Install clang
3232
run: |
@@ -36,7 +36,7 @@ jobs:
3636
3737
- name: CMake
3838
run: |
39-
cmake -S . -B cmake.output -DCMAKE_BUILD_TYPE=RelWithDebInfo -DHAVE_RULES=On -DBUILD_TESTS=On -DUSE_MATCHCOMPILER=Verify -DANALYZE_UNDEFINED=On -DENABLE_CHECK_INTERNAL=On -DCPPCHK_GLIBCXX_DEBUG=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On
39+
cmake -S . -B cmake.output -DCMAKE_BUILD_TYPE=RelWithDebInfo -DHAVE_RULES=On -DBUILD_TESTS=On -DUSE_MATCHCOMPILER=Verify -DANALYZE_UNDEFINED=On -DENABLE_CHECK_INTERNAL=On -DUSE_BOOST=On -DCPPCHK_GLIBCXX_DEBUG=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On
4040
env:
4141
CC: clang-15
4242
CXX: clang++-15

‎.github/workflows/valgrind.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,17 @@ jobs:
4040
sudo apt-get install libxml2-utils
4141
sudo apt-get install valgrind
4242
sudo apt-get install libc6-dbg-amd64-cross
43+
sudo apt-get install libboost-container-dev
4344
4445
- name: Build cppcheck
4546
run: |
4647
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
47-
CXXFLAGS="-O1 -g" make -j$(nproc) HAVE_RULES=yes MATCHCOMPILER=yes
48+
CXXFLAGS="-O1 -g -DHAVE_BOOST" make -j$(nproc) HAVE_RULES=yes MATCHCOMPILER=yes
4849
4950
- name: Build test
5051
run: |
5152
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
52-
CXXFLAGS="-O1 -g" make -j$(nproc) testrunner HAVE_RULES=yes MATCHCOMPILER=yes
53+
CXXFLAGS="-O1 -g -DHAVE_BOOST" make -j$(nproc) testrunner HAVE_RULES=yes MATCHCOMPILER=yes
5354
5455
- name: Run valgrind
5556
run: |

0 commit comments

Comments
 (0)