-
Notifications
You must be signed in to change notification settings - Fork 108
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
CI: use ubuntu-24.04 (no more Clang workaround needed); drop Qt 5
- Loading branch information
1 parent
dfff228
commit 4f59591
Showing
1 changed file
with
15 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -46,7 +46,7 @@ jobs: | |
strategy: | ||
fail-fast: false | ||
matrix: | ||
os: [ ubuntu-22.04, macos-latest, windows-latest ] | ||
os: [ ubuntu-24.04, macos-latest, windows-latest ] | ||
qt-version: [ 6 ] | ||
override-compiler: [ '', GCC ] # Defaults: MSVC on Windows, Clang elsewhere | ||
composition: [ own-quotient, static, dynamic ] | ||
|
@@ -61,20 +61,17 @@ jobs: | |
- os: macos-latest | ||
override-compiler: GCC | ||
include: | ||
- os: ubuntu-22.04 | ||
qt-version: 5 | ||
- os: ubuntu-24.04 | ||
composition: own-quotient | ||
check: appstream # Use one of faster paths for validation | ||
- os: ubuntu-22.04 | ||
qt-version: 5 | ||
composition: static | ||
- os: ubuntu-22.04 | ||
qt-version: 5 # Use one variation with external libQuotient | ||
composition: dynamic # to do CodeQL analysis (libQuotient is analysed | ||
check: codeql # in its own repo) | ||
- os: ubuntu-24.04 | ||
# Use the variation with external libQuotient to do CodeQL analysis | ||
# (libQuotient is analysed in its own repo) | ||
composition: dynamic | ||
check: codeql | ||
|
||
env: | ||
QTKEYCHAIN_REF: v0.13.2 | ||
QTKEYCHAIN_REF: 0.14.3 | ||
QUOTIENT_REF: dev | ||
VERSION: ${{ needs.Prepare.outputs.version }} | ||
|
||
|
@@ -87,7 +84,7 @@ jobs: | |
if: "!startsWith(matrix.os, 'ubuntu')" | ||
uses: jurplel/[email protected] | ||
with: | ||
version: "6.6" # "${{ startsWith(matrix.os, 'windows') && '6.5' || '6.4' }}" # CI doesn't use Qt 5 on non-Linux any more | ||
version: "6.6" | ||
cache: true | ||
cache-key-prefix: Qt | ||
modules: 'qtmultimedia' | ||
|
@@ -98,23 +95,21 @@ jobs: | |
if: startsWith(matrix.os, 'ubuntu') | ||
run: | | ||
COMMON_PKGS="libolm-dev ninja-build" | ||
COMMON_PKGS="$COMMON_PKGS clang-15" # Workaround for https://github.com/actions/runner-images/issues/8659 | ||
#COMMON_PKGS="$COMMON_PKGS clang-15" # Workaround for https://github.com/actions/runner-images/issues/8659 | ||
sudo apt-get -qq update | ||
sudo apt-get -qq install $COMMON_PKGS \ | ||
${{ matrix.qt-version == 5 | ||
&& 'qtdeclarative5-dev qttools5-dev qml-module-qtquick-controls2 qtquickcontrols2-5-dev qtmultimedia5-dev qt5keychain-dev' | ||
|| 'libgl1-mesa-dev qt6-declarative-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools qml6-module-qtquick-controls qt6-multimedia-dev qtkeychain-qt6-dev' | ||
}} | ||
libgl1-mesa-dev qt6-declarative-dev qt6-tools-dev qt6-tools-dev-tools \ | ||
qt6-l10n-tools qml6-module-qtquick-controls qt6-multimedia-dev qtkeychain-qt6-dev | ||
- name: Setup environment | ||
run: | | ||
if [[ '${{ matrix.override-compiler }}' == 'GCC' ]]; then | ||
echo "CC=gcc" >>$GITHUB_ENV | ||
echo "CXX=g++" >>$GITHUB_ENV | ||
elif [[ '${{ runner.os }}' == 'Linux' ]]; then | ||
# Workaround for https://github.com/actions/runner-images/issues/8659 | ||
echo "CC=clang-15" >>$GITHUB_ENV | ||
echo "CXX=clang++-15" >>$GITHUB_ENV | ||
# REMOVECOMMENT: Workaround for https://github.com/actions/runner-images/issues/8659 | ||
echo "CC=clang-16" >>$GITHUB_ENV | ||
echo "CXX=clang++-16" >>$GITHUB_ENV | ||
fi | ||
echo "CMAKE_ARGS=-GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo \ | ||
${{ runner.os != 'Linux' && '-DCMAKE_MAKE_PROGRAM=$IQTA_TOOLS/Ninja/ninja' || '' }} \ | ||
|