Skip to content

Commit b4bd866

Browse files
committed
CI-unixish.yml: removed unused use_qt6 flag
1 parent 9b29f9c commit b4bd866

1 file changed

Lines changed: 4 additions & 20 deletions

File tree

.github/workflows/CI-unixish.yml

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ jobs:
2121
strategy:
2222
matrix:
2323
os: [ubuntu-22.04, ubuntu-24.04, macos-13]
24-
include:
25-
- use_qt6: On
2624
fail-fast: false # Prefer quick result
2725

2826
runs-on: ${{ matrix.os }}
@@ -42,13 +40,7 @@ jobs:
4240
key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
4341

4442
- name: Install missing software on ubuntu
45-
if: contains(matrix.os, 'ubuntu') && matrix.use_qt6 == 'Off'
46-
run: |
47-
sudo apt-get update
48-
sudo apt-get install libxml2-utils libtinyxml2-dev qtbase5-dev qttools5-dev libqt5charts5-dev qtchooser
49-
50-
- name: Install missing software on ubuntu
51-
if: contains(matrix.os, 'ubuntu') && matrix.use_qt6 == 'On'
43+
if: contains(matrix.os, 'ubuntu')
5244
run: |
5345
sudo apt-get update
5446
sudo apt-get install libxml2-utils libtinyxml2-dev
@@ -66,7 +58,7 @@ jobs:
6658
- name: CMake build on ubuntu (with GUI / system tinyxml2)
6759
if: contains(matrix.os, 'ubuntu')
6860
run: |
69-
cmake -S . -B cmake.output.tinyxml2 -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=${{ matrix.use_qt6 }} -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_BUNDLED_TINYXML2=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
61+
cmake -S . -B cmake.output.tinyxml2 -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DUSE_BUNDLED_TINYXML2=Off -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
7062
cmake --build cmake.output.tinyxml2 -- -j$(nproc)
7163
7264
- name: CMake build on macos (with GUI / system tinyxml2)
@@ -84,8 +76,6 @@ jobs:
8476
strategy:
8577
matrix:
8678
os: [ubuntu-22.04, ubuntu-24.04, macos-13]
87-
include:
88-
- use_qt6: On
8979
fail-fast: false # Prefer quick result
9080

9181
runs-on: ${{ matrix.os }}
@@ -104,12 +94,6 @@ jobs:
10494
with:
10595
key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}
10696

107-
- name: Install missing software on ubuntu
108-
if: contains(matrix.os, 'ubuntu') && matrix.use_qt6 == 'Off'
109-
run: |
110-
sudo apt-get update
111-
sudo apt-get install libxml2-utils qtbase5-dev qttools5-dev libqt5charts5-dev qtchooser
112-
11397
# TODO: move latest compiler to separate step
11498
# TODO: bail out on warnings with latest GCC
11599
- name: Set up GCC
@@ -125,7 +109,7 @@ jobs:
125109
echo "CXX=g++-13" >> $GITHUB_ENV
126110
127111
- name: Install missing software on ubuntu
128-
if: contains(matrix.os, 'ubuntu') && matrix.use_qt6 == 'On'
112+
if: contains(matrix.os, 'ubuntu')
129113
run: |
130114
sudo apt-get update
131115
sudo apt-get install libxml2-utils
@@ -143,7 +127,7 @@ jobs:
143127
- name: Run CMake on ubuntu (with GUI)
144128
if: contains(matrix.os, 'ubuntu')
145129
run: |
146-
cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=${{ matrix.use_qt6 }} -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_INSTALL_PREFIX=cppcheck-cmake-install
130+
cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_INSTALL_PREFIX=cppcheck-cmake-install
147131
148132
- name: Run CMake on macos (with GUI)
149133
if: contains(matrix.os, 'macos')

0 commit comments

Comments
 (0)