Skip to content

Commit af222c7

Browse files
committed
CI Linux: use Qt6 in ubuntu-22.04
1 parent 35e30cd commit af222c7

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

.github/scripts/Linux/prepare.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,11 @@ ffmpeg_build_dep=$(get_build_deps_excl ffmpeg 'nonexistent-placeholder')
4444
sudo apt install $ffmpeg_build_dep libde265-dev libopenh264-dev
4545
sudo apt-get -y remove 'libavcodec*' 'libavutil*' 'libswscale*' libvpx-dev nginx
4646

47-
sudo apt install qtbase5-dev
47+
sudo apt install qt6-base-dev
48+
# https://bugs.launchpad.net/ubuntu/+source/qtchooser/+bug/1964763 bug workaround
49+
sudo qtchooser -install qt6 "$(command -v qmake6)" # askubuntu.com/a/1460243
50+
sudo ln -n "/usr/lib/$(uname -m)-linux-gnu/qt-default/qtchooser/qt6.conf" \
51+
"/usr/lib/$(uname -m)-linux-gnu/qt-default/qtchooser/default.conf"
4852

4953
# Install cross-platform deps
5054
"$GITHUB_WORKSPACE/.github/scripts/install-common-deps.sh"
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# inspired by https://github.com/aferrero2707/appimage-testsuite
22
# installing libraries included in https://raw.githubusercontent.com/probonopd/AppImages/master/excludelist
33
FROM ubuntu:22.04
4-
RUN apt-get update && apt-get install -y libasound2 libegl1-mesa libfontconfig1 libgl1-mesa-glx libgmp10 libharfbuzz0b libp11-kit0 libx11-6 xvfb
4+
RUN apt-get update
5+
RUN apt-get install -y libasound2 libegl1-mesa libfontconfig1 libgl1-mesa-glx \
6+
libgmp10 libharfbuzz0b libopengl0 libp11-kit0 libx11-6 xvfb

0 commit comments

Comments
 (0)