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

Force QT version in CI scripts

Browse source
This commit is contained in:
Peio Rigaux 2025-12-17 10:31:23 +01:00
parent 29664d8d0a
commit 4e0f938ec7
4 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci-files/linux-prepare.yml
View file

@ -16,6 +16,8 @@
- if ! [ -z ${TUNNEL_USER_KEY+x} ]; then mkdir -p ~/.ssh && chmod 700 ~/.ssh; fi - if ! [ -z ${TUNNEL_USER_KEY+x} ]; then mkdir -p ~/.ssh && chmod 700 ~/.ssh; fi
- if ! [ -z ${TUNNEL_USER_KEY+x} ]; then echo -e "Host gitlab.linphone.org\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config; fi - if ! [ -z ${TUNNEL_USER_KEY+x} ]; then echo -e "Host gitlab.linphone.org\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config; fi
- QT_LINUX_VER=${QT_LINUX_VER_FORCED:-$QT_LINUX_VER}
## ##
## Then configure ccache ## Then configure ccache
## ##

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

@ -27,6 +27,8 @@
.macosx-desktop: .macosx-desktop:
stage: build stage: build
tags: [ "macos-min-xcode12.2" ] tags: [ "macos-min-xcode12.2" ]
before_script:
- QT_MAC_VER=${QT_MAC_VER_FORCED:-$QT_MAC_VER}
rules: rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event" && $DOCKER_UPDATE == null && $SKIP_MACOSX == null - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $DOCKER_UPDATE == null && $SKIP_MACOSX == null
- if: $CI_PIPELINE_SOURCE == "schedule" && $DOCKER_UPDATE == null && $SKIP_MACOSX == null - if: $CI_PIPELINE_SOURCE == "schedule" && $DOCKER_UPDATE == null && $SKIP_MACOSX == null

3
.gitlab-ci-files/windows-desktop.yml
View file

@ -18,6 +18,9 @@
CMAKE_CXX_COMPILER : cl.exe CMAKE_CXX_COMPILER : cl.exe
CMAKE_RC_COMPILER : rc.exe CMAKE_RC_COMPILER : rc.exe
before_script:
- If ( Test-Path env:QT_WIN_VER_FORCED ) { $env:Path = ("C:\Qt\$QT_SUBDIR\" + $env:QT_WIN_VER_FORCED + "\msvc2022_64\bin;" + $env:Path) }
script: script:
- if ($MAKE_RELEASE_FILE_URL) { } else { $RELEASE_FILE = "" } - if ($MAKE_RELEASE_FILE_URL) { } else { $RELEASE_FILE = "" }
- echo $env:Path - echo $env:Path

6
.gitlab-ci.yml
View file

@ -12,9 +12,9 @@ variables:
DEFAULT_MACOS_CMAKE_OPTIONS: -DCMAKE_BUILD_PARALLEL_LEVEL=$MAKEFILE_JOBS DEFAULT_MACOS_CMAKE_OPTIONS: -DCMAKE_BUILD_PARALLEL_LEVEL=$MAKEFILE_JOBS
DEFAULT_WINDOWS_CMAKE_OPTIONS: -DCMAKE_BUILD_PARALLEL_LEVEL=$MAKEFILE_JOBS DEFAULT_WINDOWS_CMAKE_OPTIONS: -DCMAKE_BUILD_PARALLEL_LEVEL=$MAKEFILE_JOBS
QT_WIN_VER: 6.9.1 QT_WIN_VER_FORCED: 6.9.1
QT_MAC_VER: "6.9.1/macos" QT_MAC_VER_FORCED: "6.9.1/macos"
QT_LINUX_VER: 6.9.1 QT_LINUX_VER_FORCED: 6.9.1
# DEFAULT_LINUX_CMAKE_OPTIONS: -DENABLE_NON_FREE_CODECS=YES -DENABLE_OPENH264=YES # DEFAULT_LINUX_CMAKE_OPTIONS: -DENABLE_NON_FREE_CODECS=YES -DENABLE_OPENH264=YES
# DEFAULT_MACOS_CMAKE_OPTIONS: -DCMAKE_OSX_DEPLOYMENT_TARGET=10.11 -DENABLE_UPDATE_CHECK=YES # DEFAULT_MACOS_CMAKE_OPTIONS: -DCMAKE_OSX_DEPLOYMENT_TARGET=10.11 -DENABLE_UPDATE_CHECK=YES