Skip to content

Commit 6932522

Browse files
committed
CI fixed (?)
1 parent 2218f3c commit 6932522

1 file changed

Lines changed: 22 additions & 18 deletions

File tree

.github/workflows/CI.yml

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,29 +18,33 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
os: [ubuntu-latest, windows-latest]
21+
os: [ubuntu-latest, windows-latest, macos-latest]
2222

2323
steps:
2424
- name: Checkout
25-
uses: actions/checkout@v2
25+
uses: actions/checkout@v4
2626

2727
- name: Install Qt
28-
uses: jurplel/install-qt-action@v2
28+
uses: jurplel/install-qt-action@v4
29+
with:
30+
version: 6.10.*
31+
target: desktop
32+
archives: 'qtbase icu'
2933

30-
- name: Windows - setup MSBuild
34+
- name: Windows - set up MSVC environment
3135
if: startsWith(matrix.os, 'windows')
32-
uses: microsoft/setup-msbuild@v1.1
36+
uses: ilammy/msvc-dev-cmd@v1
37+
with:
38+
arch: x64
3339

3440
- name: Windows
3541
if: startsWith(matrix.os, 'windows')
3642
shell: cmd
3743
run: |
38-
%Qt5_DIR%\bin\qmake.exe -v
39-
dir "C:\Program Files (x86)\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC"
44+
%QT_ROOT_DIR%\bin\qmake.exe -v
4045
pushd tests
41-
call "%programfiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
42-
%Qt5_DIR%\bin\qmake.exe -tp vc -r
43-
msbuild /t:Build /p:Configuration=Release;PlatformToolset=v143
46+
%QT_ROOT_DIR%\bin\qmake.exe -tp vc -r
47+
msbuild /t:Build /p:Configuration=Release
4448
popd
4549
4650
- name: Mac
@@ -49,32 +53,32 @@ jobs:
4953
run: |
5054
clang --version
5155
pushd tests
52-
$Qt5_DIR/bin/qmake -r
56+
$QT_ROOT_DIR/bin/qmake -r -config release CONFIG+=release "DEFINES+=NDEBUG"
5357
make -j
5458
popd
5559
5660
- name: Linux
5761
if: startsWith(matrix.os, 'ubuntu')
5862
working-directory: ${{env.GITHUB_WORKSPACE}}
5963
run: |
60-
sudo apt update -y; sudo apt install -qq gcc-10 g++-10
61-
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 50
62-
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 50
6364
g++ --version
64-
65+
sudo apt update -y; sudo apt install -qq gcc-14 g++-14 # modern C++ support
66+
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-14 50
67+
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 50
68+
g++ --version
6569
pushd tests
66-
$Qt5_DIR/bin/qmake -r
70+
$QT_ROOT_DIR/bin/qmake -r -config release CONFIG+=release "DEFINES+=NDEBUG"
6771
make -j
6872
popd
6973
7074
- name: Test run
7175
if: startsWith(matrix.os, 'macos')
7276
run: ./tests/bin/tests.app/Contents/MacOS/tests
73-
77+
7478
- name: Test run
7579
if: startsWith(matrix.os, 'ubuntu')
7680
run: ./tests/bin/tests
7781

7882
- name: Test run
7983
if: startsWith(matrix.os, 'windows')
80-
run: ./tests/bin/tests.exe
84+
run: ./tests/bin/tests.exe

0 commit comments

Comments
 (0)