From 5c3ce75c02d2713064c2e4cc50e5ab70775fe1d1 Mon Sep 17 00:00:00 2001 From: Gaelle Braud Date: Mon, 30 Jun 2025 10:07:18 +0200 Subject: [PATCH] update ci file --- .gitlab-ci.yml | 2 +- docker-files/bc-dev-ubuntu-22-04-lts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9fe631730..dfdcc1ddc 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: 20250616_add-qt5compat + UBUNTU_2204_IMAGE_VERSION: 20250627_qt6-9-1 workflow: diff --git a/docker-files/bc-dev-ubuntu-22-04-lts b/docker-files/bc-dev-ubuntu-22-04-lts index fd81ceb14..b49e6234e 100644 --- a/docker-files/bc-dev-ubuntu-22-04-lts +++ b/docker-files/bc-dev-ubuntu-22-04-lts @@ -6,9 +6,9 @@ FROM ubuntu:22.04 # Qt on Ubuntu 22.04 is too old. Use a downloader. ARG QT_VERSION=5.15.2 -ARG QT6_VERSION=6.9.0 +ARG QT6_VERSION=6.9.1 #Do not use it. It seems that it cannot be used from python command. -#ARG QT_MODULES=qtnetworkauth qtquick3d qtmultimedia +#ARG QT_MODULES=qtnetworkauth qtquick3d qtmultimedia qt5compat qtshadertools LABEL Gaelle Braud @@ -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 qt5compat +RUN sudo python3 -m aqt install-qt linux desktop $QT6_VERSION -O /opt/Qt --noarchives -m qtnetworkauth qtquick3d qtmultimedia qt5compat qtshadertools RUN sudo chown -R bc:bc /opt/Qt/