Skip to content

Commit b5da24b

Browse files
committed
CI-unixish.yml: split some steps from build_cmake
1 parent 37560fe commit b5da24b

File tree

1 file changed

+30
-12
lines changed

1 file changed

+30
-12
lines changed

.github/workflows/CI-unixish.yml

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -151,13 +151,35 @@ jobs:
151151
run: |
152152
cmake --build cmake.output --target install
153153
154-
- name: Run CMake on ubuntu (no CLI)
155-
if: matrix.os == 'ubuntu-22.04'
154+
build_cmake_no_with:
155+
156+
strategy:
157+
matrix:
158+
# TODO: also run on macOS?
159+
os: [ubuntu-22.04]
160+
fail-fast: false # Prefer quick result
161+
162+
runs-on: ${{ matrix.os }}
163+
164+
steps:
165+
- uses: actions/checkout@v4
166+
with:
167+
persist-credentials: false
168+
169+
- name: Install missing software on ubuntu
170+
if: contains(matrix.os, 'ubuntu')
171+
run: |
172+
sudo apt-get update
173+
sudo apt-get install libxml2-utils
174+
# qt6-tools-dev-tools for lprodump
175+
# qt6-l10n-tools for lupdate
176+
sudo apt-get install qt6-base-dev libqt6charts6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libglx-dev libgl1-mesa-dev
177+
178+
- name: Run CMake (no CLI)
156179
run: |
157180
cmake -S . -B cmake.output_nocli -G "Unix Makefiles" -DBUILD_CLI=Off
158181
159-
- name: Run CMake on ubuntu (no CLI / with tests)
160-
if: matrix.os == 'ubuntu-22.04'
182+
- name: Run CMake (no CLI / with tests)
161183
run: |
162184
# the test and CLI code are too intertwined so for now we need to reject that
163185
if cmake -S . -B cmake.output_nocli_tests -G "Unix Makefiles" -DBUILD_TESTS=On -DBUILD_CLI=Off; then
@@ -166,18 +188,15 @@ jobs:
166188
exit 0
167189
fi
168190
169-
- name: Run CMake on ubuntu (no CLI / with GUI)
170-
if: matrix.os == 'ubuntu-22.04'
191+
- name: Run CMake (no CLI / with GUI)
171192
run: |
172193
cmake -S . -B cmake.output_nocli_gui -G "Unix Makefiles" -DBUILD_CLI=Off -DBUILD_GUI=On
173194
174-
- name: Run CMake on ubuntu (no GUI)
175-
if: matrix.os == 'ubuntu-22.04'
195+
- name: Run CMake (no GUI)
176196
run: |
177197
cmake -S . -B cmake.output_nogui -G "Unix Makefiles" -DBUILD_GUI=Off
178198
179-
- name: Run CMake on ubuntu (no GUI / with triage)
180-
if: matrix.os == 'ubuntu-22.04'
199+
- name: Run CMake (no GUI / with triage)
181200
run: |
182201
# cannot build triage without GUI
183202
if cmake -S . -B cmake.output_nogui_triage -G "Unix Makefiles" -DBUILD_GUI=Off -DBUILD_TRIAGE=On; then
@@ -186,8 +205,7 @@ jobs:
186205
exit 0
187206
fi
188207
189-
- name: Run CMake on ubuntu (no CLI / no GUI)
190-
if: matrix.os == 'ubuntu-22.04'
208+
- name: Run CMake (no CLI / no GUI)
191209
run: |
192210
cmake -S . -B cmake.output_nocli_nogui -G "Unix Makefiles" -DBUILD_GUI=Off
193211

0 commit comments

Comments
 (0)