[qt] Move utils to the standalone repo and update the setup (#3724)
This commit is contained in:
5
.github/actions/qt6-build/Dockerfile
vendored
5
.github/actions/qt6-build/Dockerfile
vendored
@@ -1,5 +0,0 @@
|
||||
FROM ghcr.io/maplibre/linux-builder:centos8-gcc11
|
||||
|
||||
# Copy and set the entry point
|
||||
COPY entrypoint.sh /entrypoint.sh
|
||||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
6
.github/actions/qt6-build/action.yml
vendored
6
.github/actions/qt6-build/action.yml
vendored
@@ -1,6 +0,0 @@
|
||||
# action.yml
|
||||
name: 'Qt6 Linux Builder'
|
||||
description: 'Helper action to build in a specific Docker container'
|
||||
runs:
|
||||
using: 'docker'
|
||||
image: 'Dockerfile'
|
||||
19
.github/actions/qt6-build/entrypoint.sh
vendored
19
.github/actions/qt6-build/entrypoint.sh
vendored
@@ -1,19 +0,0 @@
|
||||
#!/bin/bash -l
|
||||
|
||||
source /opt/rh/gcc-toolset-11/enable
|
||||
|
||||
set -e
|
||||
set -x
|
||||
|
||||
export CCACHE_DIR="$GITHUB_WORKSPACE/.ccache"
|
||||
export PATH="$QT_ROOT_DIR/bin:$PATH"
|
||||
|
||||
mkdir build && cd build
|
||||
qt-cmake ../source/ \
|
||||
-G Ninja \
|
||||
-DCMAKE_BUILD_TYPE="Release" \
|
||||
-DCMAKE_C_COMPILER_LAUNCHER="ccache" \
|
||||
-DCMAKE_CXX_COMPILER_LAUNCHER="ccache" \
|
||||
-DMLN_WITH_QT=ON \
|
||||
-DMLN_QT_IGNORE_ICU=OFF
|
||||
ninja
|
||||
32
.github/workflows/qt-ci.yml
vendored
32
.github/workflows/qt-ci.yml
vendored
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user