Skip to content

Commit 84caf53

Browse files
committed
Restoring full github actions functionality.
1 parent c15562b commit 84caf53

1 file changed

Lines changed: 8 additions & 17 deletions

File tree

.github/workflows/actions_build.yml

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ env:
1313

1414
jobs:
1515
build_gcc_ubuntu_24_04:
16-
if: false
1716
runs-on: ubuntu-24.04
1817
strategy:
1918
fail-fast: false
@@ -110,7 +109,6 @@ jobs:
110109
run: ctest -V
111110

112111
build_gcc_no_sanitize_ubuntu_24_04:
113-
if: false
114112
runs-on: ubuntu-24.04
115113
strategy:
116114
fail-fast: false
@@ -160,7 +158,6 @@ jobs:
160158
VERBOSE: 1
161159

162160
build_clang_ubuntu_22_04:
163-
if: false
164161
runs-on: ubuntu-22.04
165162
strategy:
166163
fail-fast: false
@@ -234,7 +231,6 @@ jobs:
234231
run: ctest -V
235232

236233
build_clang_ubuntu_24_04:
237-
if: false
238234
runs-on: ubuntu-24.04
239235
strategy:
240236
fail-fast: false
@@ -320,7 +316,6 @@ jobs:
320316
run: ctest -V
321317

322318
build_clang_no_sanitize_ubuntu_24_04:
323-
if: false
324319
runs-on: ubuntu-24.04
325320
strategy:
326321
fail-fast: false
@@ -373,7 +368,6 @@ jobs:
373368
VERBOSE: 1
374369

375370
build_msvc_2022:
376-
if: false
377371
runs-on: windows-2022
378372
strategy:
379373
fail-fast: false
@@ -389,21 +383,17 @@ jobs:
389383
- name: Create Build Environment
390384
run: cmake -E make_directory ${{runner.workspace}}/build
391385

392-
- name: Install Qt
386+
- name: Install Qt (sets QT_ROOT_DIR)
393387
if: ${{matrix.cpp >= 17}}
394-
shell: cmd
395-
run: |
396-
choco install curl
397-
curl -L https://github.com/martinrotter/qt-minimalistic-builds/releases/download/${{env.QT_VER}}/qt-${{env.QT_VER}}-dynamic-msvc2019-x86_64.7z -o ${{runner.workspace}}/qt.7z
398-
7z x ${{runner.workspace}}/qt.7z -o${{runner.workspace}}/qt
399-
echo QT_VER=${{env.QT_VER}} >>%GITHUB_ENV%
400-
echo QTDIR=${{runner.workspace}}/qt/qt-${{env.QT_VER}}-dynamic-msvc2019-x86_64 >>%GITHUB_ENV%
401-
env:
402-
QT_VER: ${{matrix.qt_ver == '5' && '5.15.3' || '6.2.2'}}
388+
uses: jurplel/install-qt-action@v4
389+
with:
390+
version: ${{ matrix.qt_ver == 5 && '5.15.*' || '6.8.*' }}
391+
cache: true
403392

404393
- name: Prepare externals
405394
shell: cmd
406395
run: |
396+
set QTDIR=%QT_ROOT_DIR%
407397
%GITHUB_WORKSPACE%\script\prepare_externals.bat
408398
env:
409399
BUILD_DIR: ${{runner.workspace}}/build
@@ -415,6 +405,7 @@ jobs:
415405
COMMS_TAG: ${{env.COMMS_TAG}}
416406
CC_TOOLS_QT_TAG: ${{env.CC_TOOLS_QT_TAG}}
417407
CC_TOOLS_QT_MAJOR_QT_VERSION: ${{matrix.qt_ver}}
408+
CC_TOOLS_QT_SKIP: "${{ matrix.cpp >= 17 && (matrix.qt_ver == 6 || matrix.cpp < 20) && '0' || '1' }}"
418409

419410
- name: Configure CMake
420411
shell: cmd
@@ -435,7 +426,7 @@ jobs:
435426
436427
env:
437428
TOOLS_CXX_STANDARD: "${{ matrix.cpp >= 17 && matrix.cpp || '17' }}"
438-
BUILD_TOOLS_QT_UNIT_TESTS: "${{ matrix.cpp >= 17 && 'ON' || 'OFF' }}"
429+
BUILD_TOOLS_QT_UNIT_TESTS: "${{ matrix.cpp >= 17 && (matrix.qt_ver == 6 || matrix.cpp < 20) && 'ON' || 'OFF' }}"
439430

440431
- name: Build Target
441432
working-directory: ${{runner.workspace}}/build

0 commit comments

Comments
 (0)