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

Fix CI for 5.2 / linux

Browse source
This commit is contained in:
Christophe Deschamps 2024-10-17 07:33:04 +02:00 • committed by Julien Wadel
parent ba66f873a8
commit 22246a679c
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitlab-ci-files/job-linux-desktop-ubuntu-2004.yml
View file

@ -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

4
.gitlab-ci-files/job-linux-desktop.yml
View file

@ -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