tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[qt] Move utils to the standalone repo and update the setup (#3724)

Browse Source
This commit is contained in:
Tadej Novak
2025-08-15 22:36:54 +02:00
committed by GitHub
parent ef3954eb43
commit 153a980acf
10 changed files with 34 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
.github/workflows/qt-ci.yml vendored
View File

@@ -59,22 +59,16 @@ jobs:
strategy:
matrix:
include:
- name: Linux_GCC11
os: ubuntu-24.04
build_type: RelWithDebInfo
qt_version: 6.8.1
qt_target: desktop
compiler: ""
- name: Linux_GCC14
os: ubuntu-24.04
build_type: RelWithDebInfo
qt_version: 6.8.1
qt_version: 6.9.1
qt_target: desktop
compiler: "gcc-14"
- name: macOS
os: macos-14
build_type: RelWithDebInfo
qt_version: 6.8.1
qt_version: 6.9.1
qt_target: desktop
deployment_target: 12.0
deployment_arch: "x86_64;arm64"
@@ -82,7 +76,7 @@ jobs:
- name: macOS_LLVM
os: macos-14
build_type: RelWithDebInfo
qt_version: 6.8.1
qt_version: 6.9.1
qt_target: desktop
deployment_target: 12.0
deployment_arch: "arm64"
@@ -91,7 +85,7 @@ jobs:
os: windows-2022
build_type: "RelWithDebInfo"
compiler_type: x64
qt_version: 6.8.1
qt_version: 6.9.1
qt_target: desktop
qt_arch: win64_msvc2022_64
qt_tools: ""
@@ -112,7 +106,7 @@ jobs:
submodules: true
- name: Install test dependencies
if: runner.os == 'Linux' && matrix.compiler != ''
if: runner.os == 'Linux'
run: |
sudo apt-get update
sudo apt-get install \
@@ -130,13 +124,13 @@ jobs:
- name: Install compiler (Linux)
id: install_compiler
if: runner.os == 'Linux' && matrix.compiler != ''
if: runner.os == 'Linux'
uses: rlalik/setup-cpp-compiler@master
with:
compiler: ${{ matrix.compiler }}
- name: Setup compiler (Linux)
if: runner.os == 'Linux' && matrix.compiler != ''
if: runner.os == 'Linux'
env:
CC: ${{ steps.install_compiler.outputs.cc }}
CXX: ${{ steps.install_compiler.outputs.cxx }}
@@ -209,11 +203,7 @@ jobs:
ninja
- name: Build maplibre-native (Linux, Qt6)
if: runner.os == 'Linux' && matrix.compiler == ''
uses: ./source/.github/actions/qt6-build
- name: Build maplibre-native (Linux, Qt6, custom compiler)
if: runner.os == 'Linux' && matrix.compiler != ''
if: runner.os == 'Linux'
run: |
mkdir build && cd build
qt-cmake ../source/ \
@@ -224,8 +214,8 @@ jobs:
-DMLN_WITH_QT=ON
ninja
- name: Build maplibre-native (Linux, Qt6, custom compiler, internal libraries)
if: runner.os == 'Linux' && matrix.compiler != ''
- name: Build maplibre-native (Linux, Qt6, internal libraries)
if: runner.os == 'Linux'
run: |
mkdir build-internal && cd build-internal
qt-cmake ../source/ \
@@ -239,7 +229,7 @@ jobs:
ninja
- name: Run tests (Linux)
if: runner.os == 'Linux' && matrix.compiler != ''
if: runner.os == 'Linux'
uses: coactions/setup-xvfb@v1
with:
run: ctest --output-on-failure