mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-17 11:28:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow switch between QT proprietary and opensource for same version. Updated docker image and CI scripts

Browse source
This commit is contained in:
Peio Rigaux 2025-09-30 11:53:35 +02:00 • committed by Gaelle Braud
parent 89a032665c
commit 95b13b1192
2 changed files with 70 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.gitlab-ci.yml
View file

@ -21,13 +21,7 @@ variables:
#CMAKE_OPTIONS: -DENABLE_LIME_X3DH=YES
# Docker image version
ARCHLINUX_IMAGE_VERSION: latestupdated
CENTOS_7_QT_IMAGE_VERSION: 20211012_add_qtwebview
DEBIAN_9_QT_IMAGE_VERSION: 20230417_qtopen_gstreamer
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: 20250630_add-qtshadertools
UBUNTU_2204_IMAGE_VERSION: 20250930_add_commercial_qt_versions_5.15.14_5.15.19_6.8.1_6.8.3_6.9.1
workflow:

72
docker-files/bc-dev-ubuntu-22-04-lts
View file

@ -94,7 +94,73 @@ RUN sudo python3 -m aqt install-qt linux desktop $QT6_VERSION -O /opt/Qt --noarc
RUN sudo chown -R bc:bc /opt/Qt/
RUN qtchooser -install $QT_VERSION /opt/Qt/$QT_VERSION/gcc_64/bin/qmake
RUN qtchooser -install $QT6_VERSION /opt/Qt/$QT6_VERSION/gcc_64/bin/qmake
RUN qtchooser -install "$QT_VERSION-opensource" /opt/Qt/opensource/$QT_VERSION/gcc_64/bin/qmake
RUN qtchooser -install "$QT6_VERSION-opensource" /opt/Qt/opensource/$QT6_VERSION/gcc_64/bin/qmake
CMD bash
# Download QT official installer for proprietary versions
# -O : name the destination file after the remote file name, in the current directory
# -L : follow http redirections
RUN curl -O -L https://download.qt.io/official_releases/online_installers/qt-online-installer-linux-x64-online.run
RUN chmod u+x qt-online-installer-linux-x64-online.run
RUN mkdir -p /home/bc/.local/share/Qt/
# Ask infra@belledonne-communications.com for these files
COPY qtaccount.ini /home/bc/.local/share/Qt/
COPY qtlicenses.ini /home/bc/.local/share/Qt/
RUN sudo chmod 600 /home/bc/.local/share/Qt/*
RUN sudo chown bc /home/bc/.local/share/Qt/*
# Install Qt 5.15.19 proprietary
RUN ./qt-online-installer-linux-x64-online.run \
--accept-licenses \
--accept-obligations \
--confirm-command \
--root "/opt/Qt/proprietary" \
--auto-answer OperationDoesNotExistError=Ignore,OverwriteTargetDirectory=Yes,stopProcessesForUpdates=Ignore,installationErrorWithCancel=Ignore,InstallationErrorWithIgnore=Ignore,AssociateCommonFiletypes=Yes,telemetry-question=No \
install qt.qt5.51519.gcc_64 qt.qt5.51519.qtnetworkauth qt.qt5.51519.qtquick3d
# Install Qt 5.15.14 proprietary
RUN /opt/Qt/proprietary/MaintenanceTool \
--accept-licenses \
--accept-obligations \
--confirm-command \
--root "/opt/Qt/proprietary" \
--auto-answer OperationDoesNotExistError=Ignore,OverwriteTargetDirectory=Yes,stopProcessesForUpdates=Ignore,installationErrorWithCancel=Ignore,InstallationErrorWithIgnore=Ignore,AssociateCommonFiletypes=Yes,telemetry-question=No \
install qt.qt5.51514.gcc_64 qt.qt5.51514.qtnetworkauth qt.qt5.51514.qtquick3d
# Install Qt 6.8.1 proprietary
RUN /opt/Qt/proprietary/MaintenanceTool \
--accept-licenses \
--accept-obligations \
--confirm-command \
--root "/opt/Qt/proprietary" \
--auto-answer OperationDoesNotExistError=Ignore,OverwriteTargetDirectory=Yes,stopProcessesForUpdates=Ignore,installationErrorWithCancel=Ignore,InstallationErrorWithIgnore=Ignore,AssociateCommonFiletypes=Yes,telemetry-question=No \
install qt.qt6.681.linux_gcc_64 qt.qt6.681.addons.qtnetworkauth qt.qt6.681.addons.qtquick3d qt.qt6.681.addons.qtmultimedia qt.qt6.681.addons.qt5compat qt.qt6.681.addons.qtshadertools
# # Install Qt 6.8.3 proprietary
RUN /opt/Qt/proprietary/MaintenanceTool \
--accept-licenses \
--accept-obligations \
--confirm-command \
--root "/opt/Qt/proprietary" \
--auto-answer OperationDoesNotExistError=Ignore,OverwriteTargetDirectory=Yes,stopProcessesForUpdates=Ignore,installationErrorWithCancel=Ignore,InstallationErrorWithIgnore=Ignore,AssociateCommonFiletypes=Yes,telemetry-question=No \
install qt.qt6.683.linux_gcc_64 qt.qt6.683.addons.qtnetworkauth qt.qt6.683.addons.qtquick3d qt.qt6.683.addons.qtmultimedia qt.qt6.683.addons.qt5compat qt.qt6.683.addons.qtshadertools
# # Install Qt 6.9.1 proprietary
RUN /opt/Qt/proprietary/MaintenanceTool \
--accept-licenses \
--accept-obligations \
--confirm-command \
--root "/opt/Qt/proprietary" \
--auto-answer OperationDoesNotExistError=Ignore,OverwriteTargetDirectory=Yes,stopProcessesForUpdates=Ignore,installationErrorWithCancel=Ignore,InstallationErrorWithIgnore=Ignore,AssociateCommonFiletypes=Yes,telemetry-question=No \
install qt.qt6.691.linux_gcc_64 qt.qt6.691.addons.qtnetworkauth qt.qt6.691.addons.qtquick3d qt.qt6.691.addons.qtmultimedia qt.qt6.691.addons.qt5compat qt.qt6.691.addons.qtshadertools
RUN qtchooser -install 5.15.19-proprietary /opt/Qt/proprietary/5.15.19/gcc_64/bin/qmake
RUN qtchooser -install 5.15.14-proprietary /opt/Qt/proprietary/5.15.14/gcc_64/bin/qmake
RUN qtchooser -install 6.8.1-proprietary /opt/Qt/proprietary/6.8.1/gcc_64/bin/qmake
RUN qtchooser -install 6.8.3-proprietary /opt/Qt/proprietary/6.8.3/gcc_64/bin/qmake
RUN qtchooser -install 6.9.1-proprietary /opt/Qt/proprietary/6.9.1/gcc_64/bin/qmake
cmd bash