Skip to content

Commit 2f1de5b

Browse files
committed
fix CI coverity
The workarond is not needed in U24.04 (current ubuntu-latest used by coverity-scan) and actually doesn't work (qtchooser is not installed).
1 parent 65d8867 commit 2f1de5b

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

.github/scripts/Linux/prepare.sh

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,14 @@ sudo apt install $ffmpeg_build_dep libdav1d-dev libde265-dev libopenh264-dev
4444
sudo apt-get -y remove 'libavcodec*' 'libavutil*' 'libswscale*' libvpx-dev nginx
4545

4646
sudo apt install qt6-base-dev
47-
# https://bugs.launchpad.net/ubuntu/+source/qtchooser/+bug/1964763 bug workaround
48-
sudo qtchooser -install qt6 "$(command -v qmake6)" # askubuntu.com/a/1460243
49-
sudo ln -n "/usr/lib/$(uname -m)-linux-gnu/qt-default/qtchooser/qt6.conf" \
50-
"/usr/lib/$(uname -m)-linux-gnu/qt-default/qtchooser/default.conf"
47+
. /etc/os-release # source ID and VERSION_ID
48+
if [ "$ID" = ubuntu ] && [ "$VERSION_ID" = 22.04 ]; then
49+
# https://bugs.launchpad.net/ubuntu/+source/qtchooser/+bug/1964763 bug
50+
# workaround proposed in https://askubuntu.com/a/1460243
51+
sudo qtchooser -install qt6 "$(command -v qmake6)"
52+
sudo ln -n "/usr/lib/$(uname -m)-linux-gnu/qt-default/qtchooser/\
53+
qt6.conf" "/usr/lib/$(uname -m)-linux-gnu/qt-default/qtchooser/default.conf"
54+
fi
5155

5256
# Install cross-platform deps
5357
"$GITHUB_WORKSPACE/.github/scripts/install-common-deps.sh"

0 commit comments

Comments
 (0)