From cbe29c66ee5bcdf566984a3546cd64e6d9f454bc Mon Sep 17 00:00:00 2001 From: Gaelle Braud Date: Mon, 16 Jun 2025 11:19:21 +0200 Subject: [PATCH] fix ci --- .gitignore | 1 + .gitlab-ci.yml | 2 +- docker-files/bc-dev-ubuntu-22-04-lts | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9a56aa1d1..f30a52645 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,4 @@ linphone.spec # VSCode linphone60*.log linphone61*.log +linphone62*.log diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f9914def9..9fe631730 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,7 +27,7 @@ variables: DEBIAN_10_IMAGE_VERSION: 20210217_python3 UBUNTU_ROLLING_IMAGE_VERSION: 20211012_add_qtwebview UBUNTU_2004_IMAGE_VERSION: 20250226_qt6-8-0 - UBUNTU_2204_IMAGE_VERSION: 20250512_qt6-9-0 + UBUNTU_2204_IMAGE_VERSION: 20250616_add-qt5compat workflow: diff --git a/docker-files/bc-dev-ubuntu-22-04-lts b/docker-files/bc-dev-ubuntu-22-04-lts index 1dbc5ff63..fd81ceb14 100644 --- a/docker-files/bc-dev-ubuntu-22-04-lts +++ b/docker-files/bc-dev-ubuntu-22-04-lts @@ -90,7 +90,7 @@ RUN sudo pip3 install --upgrade aqtinstall RUN sudo python3 -m aqt install-qt linux desktop $QT_VERSION -O /opt/Qt RUN sudo python3 -m aqt install-qt linux desktop $QT_VERSION -O /opt/Qt --noarchives -m qtnetworkauth qtquick3d RUN sudo python3 -m aqt install-qt linux desktop $QT6_VERSION -O /opt/Qt -RUN sudo python3 -m aqt install-qt linux desktop $QT6_VERSION -O /opt/Qt --noarchives -m qtnetworkauth qtquick3d qtmultimedia +RUN sudo python3 -m aqt install-qt linux desktop $QT6_VERSION -O /opt/Qt --noarchives -m qtnetworkauth qtquick3d qtmultimedia qt5compat RUN sudo chown -R bc:bc /opt/Qt/