GitHub CI: bump Qt version, bump Ubuntu build host version

Ubuntu 20.04 comes with Python 3.8 and aqtinstall requires 3.9
nowadays
This commit is contained in:
Robert Griebl
2024-12-08 20:34:40 +01:00
parent 7671bee75a
commit 64638bb692
2 changed files with 17 additions and 10 deletions
+11 -10
View File
@@ -48,7 +48,7 @@ jobs:
runs-on: windows-2022
os: windows
qt_host: 'windows'
qt_version: '6.8.0'
qt_version: '6.8.1'
qt_arch: 'win64_msvc2022_64'
qt_dir: "msvc2022_64"
environment_script: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat"
@@ -60,7 +60,7 @@ jobs:
os: windows
qt_host: 'windows'
qt_host_arch: 'win64_msvc2022_64'
qt_version: '6.8.0'
qt_version: '6.8.1'
qt_arch: 'win64_msvc2022_arm64_cross_compiled'
qt_dir: "msvc2022_arm64"
environment_script: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvarsamd64_arm64.bat"
@@ -83,12 +83,12 @@ jobs:
- name: "Linux AppImage"
artifact: "Linux-AppImage"
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
os: linux
appimage: true
qt_tools: tools_opensslv3_src
qt_host: 'linux'
qt_version: '6.8.0'
qt_version: '6.8.1'
qt_arch: 'linux_gcc_64'
qt_dir: 'gcc_64'
@@ -99,7 +99,7 @@ jobs:
snap: true
qt_tools: tools_opensslv3_src
qt_host: 'linux'
qt_version: '6.8.0'
qt_version: '6.8.1'
qt_arch: 'linux_gcc_64'
qt_dir: 'gcc_64'
@@ -110,7 +110,7 @@ jobs:
flatpak: true
qt_tools: tools_opensslv3_src
qt_host: 'linux'
qt_version: '6.8.0'
qt_version: '6.8.1'
qt_arch: 'linux_gcc_64'
qt_dir: 'gcc_64'
@@ -119,7 +119,7 @@ jobs:
runs-on: macos-13
os: macos
qt_host: 'mac'
qt_version: '6.8.0'
qt_version: '6.8.1'
qt_arch: 'clang_64'
qt_dir: 'macos'
cmake_extra_config: '-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DSENTRY=ON'
@@ -190,7 +190,8 @@ jobs:
&& (steps.cache-qt.outputs.cache-hit != 'true')
shell: sh
run: |
python3 -m pip install git+https://github.com/miurahr/aqtinstall@master
python3 -m pip install aqtinstall
# python3 -m pip install git+https://github.com/miurahr/aqtinstall@master
if [ "${{ matrix.config.qt_host_arch }}" != "" ]; then
python3 -m aqt -c .github/aqt-settings.ini install-qt -O "${{ runner.workspace }}/Qt/" \
${{ matrix.config.qt_host }} desktop \
@@ -312,7 +313,7 @@ jobs:
sudo DEBIAN_FRONTEND=noninteractive apt -y update
sudo DEBIAN_FRONTEND=noninteractive apt -y install \
g++-10 cmake ninja-build libglvnd-dev libtbb-dev libxkbcommon-dev libxkbcommon-x11-0 \
libxcb-\* libpulse-dev libgstreamer\*1.0-dev libsecret-1-dev libva-dev libcups2-dev
libxcb-\* libpulse-dev libgstreamer\*1.0-dev libsecret-1-dev libva-dev libcups2-dev libfuse2
${Qt6_DIR}/bin/qt-cmake -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_C_COMPILER=/usr/bin/gcc-10 -DCMAKE_CXX_COMPILER=/usr/bin/g++-10 \
${{ matrix.config.cmake_extra_config }} -B build -S .
@@ -670,7 +671,7 @@ jobs:
release:
needs: [ build ]
if: startsWith(github.ref, 'refs/tags/v')
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
+6
View File
@@ -73,6 +73,12 @@
#include <limits.h>
#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
# if defined(__ARM_FEATURE_CRC32)
# include <arm_acle.h>
# endif
#endif
QT_BEGIN_NAMESPACE
/*