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

[qt] Try to stabilise the CI (#2120)

Browse Source 
Co-authored-by: Bart Louwers <bart@emeel.net>
This commit is contained in:
Tadej Novak
2024-02-17 22:47:07 +01:00
committed by GitHub
parent 7387bb8c02
commit 2d73f9b260
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.github/actionlint.yaml vendored
View File

@@ -2,6 +2,7 @@ self-hosted-runner:
# Labels of self-hosted runner in array of strings.
labels:
- MapLibre_Native_Linux_16_core
- macos-14 # can be removed once actionlint is updated
# Configuration variables in array of strings defined in your repository or
# organization. `null` means disabling configuration variables check.
# Empty array means no configuration variable is allowed.

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

@@ -78,7 +78,7 @@ jobs:
qt_target: desktop
compiler: "gcc-13"
- name: macOS
os: macos-12
os: macos-13
build_type: RelWithDebInfo
qt_version: 5.15.2
qt_target: desktop
@@ -86,20 +86,20 @@ jobs:
deployment_arch: "x86_64"
compiler: ""
- name: macOS
os: macos-12
os: macos-14
build_type: RelWithDebInfo
qt_version: 6.5.3
qt_version: 6.6.2
qt_target: desktop
deployment_target: 11.0
deployment_arch: "x86_64;arm64"
compiler: ""
- name: macOS_LLVM17
os: macos-13
os: macos-14
build_type: RelWithDebInfo
qt_version: 6.5.3
qt_version: 6.6.2
qt_target: desktop
deployment_target: 11.0
deployment_arch: "x86_64"
deployment_arch: "arm64"
compiler: "llvm@17"
- name: win64_msvc2019
os: windows-2022
@@ -145,6 +145,7 @@ jobs:
- name: Install test dependencies
if: runner.os == 'Linux' && matrix.compiler != ''
run: |
sudo apt-get update
sudo apt-get install \
libxkbcommon-x11-0 \
libxcb-cursor0 \
@@ -184,12 +185,12 @@ jobs:
# https://github.com/actions/runner-images/issues/8838#issuecomment-1817486924
brew link --overwrite python@3.12
brew install "$MLN_COMPILER"
echo "/usr/local/opt/${MLN_COMPILER}/bin" >> "$GITHUB_PATH"
echo "/opt/homebrew/opt/${MLN_COMPILER}/bin" >> "$GITHUB_PATH"
{
echo "CC=/usr/local/opt/${MLN_COMPILER}/bin/clang"
echo "CXX=/usr/local/opt/${MLN_COMPILER}/bin/clang++"
echo "LDFLAGS=\"-L/usr/local/opt/${MLN_COMPILER}/lib\""
echo "CPPFLAGS=\"-I/usr/local/opt/${MLN_COMPILER}/include\""
echo "CC=/opt/homebrew/opt/${MLN_COMPILER}/bin/clang"
echo "CXX=/opt/homebrew/opt/${MLN_COMPILER}/bin/clang++"
echo "LDFLAGS=\"-L/opt/homebrew/opt/${MLN_COMPILER}/lib\""
echo "CPPFLAGS=\"-I/opt/homebrew/opt/${MLN_COMPILER}/include\""
} >> "$GITHUB_ENV"
- name: Setup Xcode
@@ -217,6 +218,7 @@ jobs:
target: ${{ matrix.qt_target }}
arch: ${{ matrix.qt_arch }}
tools: ${{ matrix.qt_tools }}
extra: --base https://mirrors.ocf.berkeley.edu/qt/
- name: Update ccache
if: runner.os == 'Windows'