From 22246a679c74f2e8a00a26db7ec32f6b2a05ebf3 Mon Sep 17 00:00:00 2001 From: Christophe Deschamps Date: Thu, 17 Oct 2024 07:33:04 +0200 Subject: [PATCH] Fix CI for 5.2 / linux --- .gitlab-ci-files/job-linux-desktop-ubuntu-2004.yml | 6 +++--- .gitlab-ci-files/job-linux-desktop.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci-files/job-linux-desktop-ubuntu-2004.yml b/.gitlab-ci-files/job-linux-desktop-ubuntu-2004.yml index 1843b269d..7c43ea8ed 100644 --- a/.gitlab-ci-files/job-linux-desktop-ubuntu-2004.yml +++ b/.gitlab-ci-files/job-linux-desktop-ubuntu-2004.yml @@ -86,10 +86,10 @@ ubuntu2004-makefile-gcc: - echo $CMAKE_GENERATOR - echo $DEFAULT_LINUX_CMAKE_OPTIONS - echo $CMAKE_SANITIZER_OPTIONS - - eval "$(qtchooser -qt=$QT_LINUX_VER -print-env)" + - eval "$(qtchooser -qt=$QT5_LINUX_VER -print-env)" - export PATH=${QTTOOLDIR}:$PATH - export Qt5_DIR=${QTLIBDIR}/cmake/Qt5 - - echo "Using Qt $QT_LINUX_VER at ${QTLIBDIR}" + - echo "Using Qt $QT5_LINUX_VER at ${QTLIBDIR}" - cd build - cmake .. -G "$CMAKE_GENERATOR" -DCMAKE_VERBOSE_MAKEFILE=ON -DLINPHONESDK_PLATFORM=Desktop -DCMAKE_BUILD_TYPE=$CI_BUILD_TYPE $DEFAULT_LINUX_CMAKE_OPTIONS $CMAKE_OPTIONS $SCHEDULE_CMAKE_OPTIONS $CMAKE_SANITIZER_OPTIONS - cmake --build . --target install --config $CI_BUILD_TYPE $LBC_NODEBUG_OPTIONS @@ -132,7 +132,7 @@ ubuntu2004-makefile-gcc-package: - echo $CMAKE_GENERATOR - echo $DEFAULT_LINUX_CMAKE_OPTIONS - echo $CMAKE_SANITIZER_OPTIONS - - eval "$(qtchooser -qt=$QT_LINUX_VER -print-env)" + - eval "$(qtchooser -qt=$QT5_LINUX_VER -print-env)" - export PATH=${QTTOOLDIR}:$PATH - export Qt5_DIR=${QTLIBDIR}/cmake/Qt5 - cd build diff --git a/.gitlab-ci-files/job-linux-desktop.yml b/.gitlab-ci-files/job-linux-desktop.yml index c35847ac5..db659f89e 100644 --- a/.gitlab-ci-files/job-linux-desktop.yml +++ b/.gitlab-ci-files/job-linux-desktop.yml @@ -12,10 +12,10 @@ echo $DEFAULT_LINUX_CMAKE_OPTIONS echo $CMAKE_SANITIZER_OPTIONS cd build - eval "$(qtchooser -qt=$QT_LINUX_VER -print-env)" + eval "$(qtchooser -qt=$QT5_LINUX_VER -print-env)" export PATH=${QTTOOLDIR}:$PATH export Qt5_DIR=${QTLIBDIR}/cmake/Qt5 - echo "Using Qt $QT_LINUX_VER at ${QTLIBDIR}" + echo "Using Qt $QT5_LINUX_VER at ${QTLIBDIR}" cmake .. -G "$CMAKE_GENERATOR" -DCMAKE_VERBOSE_MAKEFILE=ON -DLINPHONESDK_PLATFORM=Desktop -DCMAKE_BUILD_TYPE=$CI_BUILD_TYPE $DEFAULT_LINUX_CMAKE_OPTIONS $CMAKE_OPTIONS $SCHEDULE_CMAKE_OPTIONS $CMAKE_SANITIZER_OPTIONS cmake --build . --target install --config $CI_BUILD_TYPE $LBC_NODEBUG_OPTIONS