diff --git a/.gitlab-ci-files/linux-prepare.yml b/.gitlab-ci-files/linux-prepare.yml index 3b8d689f0..03cabb4d5 100644 --- a/.gitlab-ci-files/linux-prepare.yml +++ b/.gitlab-ci-files/linux-prepare.yml @@ -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 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 ## diff --git a/.gitlab-ci-files/macosx-desktop.yml b/.gitlab-ci-files/macosx-desktop.yml index 883b6f511..cc9d4f7d2 100644 --- a/.gitlab-ci-files/macosx-desktop.yml +++ b/.gitlab-ci-files/macosx-desktop.yml @@ -26,7 +26,9 @@ .macosx-desktop: stage: build - tags: [ "macosx-min-xcode12.2" ] + tags: [ "macos-min-xcode12.2" ] + before_script: + - QT_MAC_VER=${QT_MAC_VER_FORCED:-$QT_MAC_VER} 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 @@ -85,7 +87,7 @@ macosx-ninja-novideo: # variables: # - $NIGHTLY_MASTER # - $DEPLOY_RUN_MACOSX -# +# ################################################# # Package - Nightly diff --git a/.gitlab-ci-files/windows-desktop.yml b/.gitlab-ci-files/windows-desktop.yml index 617f4fa2a..a28ee2364 100644 --- a/.gitlab-ci-files/windows-desktop.yml +++ b/.gitlab-ci-files/windows-desktop.yml @@ -18,6 +18,9 @@ CMAKE_CXX_COMPILER : cl.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: - if ($MAKE_RELEASE_FILE_URL) { } else { $RELEASE_FILE = "" } - echo $env:Path diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0c3ab8f64..2deb7d311 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,6 +12,10 @@ variables: DEFAULT_MACOS_CMAKE_OPTIONS: -DCMAKE_BUILD_PARALLEL_LEVEL=$MAKEFILE_JOBS DEFAULT_WINDOWS_CMAKE_OPTIONS: -DCMAKE_BUILD_PARALLEL_LEVEL=$MAKEFILE_JOBS + QT_WIN_VER_FORCED: 6.10.2 + QT_MAC_VER_FORCED: "6.10.2/macos" + QT_LINUX_VER_FORCED: 6.10.2 + # 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_WINDOWS_CMAKE_OPTIONS: -DENABLE_NON_FREE_CODECS=YES -DENABLE_OPENH264=YES -DENABLE_UPDATE_CHECK=YES