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

Add back Qt 6.8.3 for GNU/Linux and mac, use back precedent macos tag since we don't need macos 14+ anymore

Browse source
This commit is contained in:
Peio Rigaux 2026-02-09 16:10:46 +01:00 • committed by gaelle
parent 3f53759f86
commit 7c3bed2bcb
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.gitlab-ci-files/macosx-desktop.yml
View file

@ -26,7 +26,7 @@
.macosx-desktop:
stage: build
tags: [ "macmini-m1-xcode15-flat" ]
tags: [ "macosx-min-xcode12.2-flat" ]
rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event" && $DOCKER_UPDATE == null && $SKIP_MACOSX == null
- if: $CI_PIPELINE_SOURCE == "schedule" && $DOCKER_UPDATE == null && $SKIP_MACOSX == null
@ -93,7 +93,7 @@ macosx-ninja-novideo:
# WAIT for QT6 for arm64
macosx-ninja-package:
stage: package
tags: [ "macmini-m1-xcode15-flat" ]
tags: [ "macosx-min-xcode12.2-flat" ]
needs: []
rules:
- !reference [.rules-merge-request-manual, rules]
@ -117,7 +117,7 @@ macosx-ninja-package:
macosx-codesigning:
stage: signing
tags: [ "macmini-m1-xcode15-flat" ]
tags: [ "macosx-min-xcode12.2-flat" ]
needs:
- macosx-ninja-package
rules:
@ -142,7 +142,7 @@ macosx-codesigning:
macosx-deploy:
stage: deploy
tags: [ "macmini-m1-xcode15-flat" ]
tags: [ "macosx-min-xcode12.2-flat" ]
needs:
- macosx-codesigning
only:
@ -160,7 +160,7 @@ macosx-deploy:
macosx-makefile-plugins-deploy:
stage: deploy
tags: [ "macmini-m1-xcode15-flat" ]
tags: [ "macosx-min-xcode12.2-flat" ]
needs:
- macosx-makefile
only:

2
.gitlab-ci.yml
View file

@ -21,7 +21,7 @@ variables:
#CMAKE_OPTIONS: -DENABLE_LIME_X3DH=YES
# Docker image version
UBUNTU_2204_IMAGE_VERSION: 20251106_add_commercial_qt_version_5.15.14_5.15.19_6.8.1_6.8.3_6.9.1_6.10.0
UBUNTU_2204_IMAGE_VERSION: 20260209_add_qt_6.8.3_opensource
workflow:

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

@ -87,6 +87,8 @@ RUN sudo apt install -y python3-py7zr
RUN sudo pip3 install --upgrade aqtinstall
RUN sudo python3 -m aqt install-qt linux desktop 5.15.2 -O /opt/Qt/opensource
RUN sudo python3 -m aqt install-qt linux desktop 5.15.2 -O /opt/Qt/opensource --noarchives -m qtnetworkauth qtquick3d
RUN sudo python3 -m aqt install-qt linux desktop 6.8.3 -O /opt/Qt/opensource
RUN sudo python3 -m aqt install-qt linux desktop 6.8.3 -O /opt/Qt/opensource --noarchives -m qtnetworkauth qtquick3d qt5compat qtshadertools
RUN sudo python3 -m aqt install-qt linux desktop 6.9.1 -O /opt/Qt/opensource
RUN sudo python3 -m aqt install-qt linux desktop 6.9.1 -O /opt/Qt/opensource --noarchives -m qtnetworkauth qtquick3d qt5compat qtshadertools
RUN sudo python3 -m aqt install-qt linux desktop 6.10.0 -O /opt/Qt/opensource
@ -95,6 +97,7 @@ RUN sudo python3 -m aqt install-qt linux desktop 6.10.0 -O /opt/Qt/opensource --
RUN sudo chown -R bc:bc /opt/Qt/
RUN qtchooser -install "5.15.2-opensource" /opt/Qt/opensource/5.15.2/gcc_64/bin/qmake
RUN qtchooser -install "6.8.3-opensource" /opt/Qt/opensource/6.8.3/gcc_64/bin/qmake
RUN qtchooser -install "6.9.1-opensource" /opt/Qt/opensource/6.9.1/gcc_64/bin/qmake
RUN qtchooser -install "6.10.0-opensource" /opt/Qt/opensource/6.10.0/gcc_64/bin/qmake