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

CI: fix mac runner

Browse source
This commit is contained in:
Julien Wadel 2025-04-29 14:26:09 +02:00
parent 5d6e3b51e0
commit 8e5fb5c9c5
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
.gitlab-ci-files/job-macosx-desktop.yml
View file

@ -18,13 +18,13 @@
echo $DEFAULT_MACOS_CMAKE_OPTIONS
echo $CMAKE_OPTIONS
echo $ADDITIONAL_BUILD_OPTIONS
cmake .. -G "$CMAKE_GENERATOR" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DCMAKE_BUILD_TYPE=$CI_BUILD_TYPE $DEFAULT_MACOS_CMAKE_OPTIONS -DLINPHONE_BUILDER_SIGNING_IDENTITY="$MACOS_SIGNING_IDENTITY" $XCODE_OPTIONS $CMAKE_OPTIONS $SCHEDULE_CMAKE_OPTIONS $RELEASE_FILE
cmake .. -G "$CMAKE_GENERATOR" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_BUILD_TYPE=$CI_BUILD_TYPE $DEFAULT_MACOS_CMAKE_OPTIONS -DLINPHONE_BUILDER_SIGNING_IDENTITY="$MACOS_SIGNING_IDENTITY" $XCODE_OPTIONS $CMAKE_OPTIONS $SCHEDULE_CMAKE_OPTIONS $RELEASE_FILE
cmake --build . --target install --config $CI_BUILD_TYPE $LBC_NODEBUG_OPTIONS -- $ADDITIONAL_BUILD_OPTIONS
ccache -s
.job-macosx-desktop:
stage: build
tags: [ "macos-xcode13" ]
tags: [ "macos-min-xcode12.2" ]
script:
- *build_all_script
variables:
@ -46,7 +46,7 @@ job-macosx-ninja:
- schedules
variables:
CMAKE_GENERATOR: Ninja
CMAKE_OPTIONS: -DENABLE_PQCRYPTO=OFF
CMAKE_OPTIONS: -DPython3_ROOT_DIR=/opt/bc/pip-packages/ -DENABLE_PQCRYPTO=OFF
extends: .job-macosx-desktop
#################################################
@ -59,7 +59,7 @@ job-macosx-makefile:
- if: $DEPLOY_PLUGINS
variables:
CMAKE_GENERATOR: Unix Makefiles
CMAKE_OPTIONS: -DENABLE_PQCRYPTO=OFF
CMAKE_OPTIONS: -DPython3_ROOT_DIR=/opt/bc/pip-packages/ -DENABLE_PQCRYPTO=OFF
ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS
extends: .job-macosx-desktop
@ -68,7 +68,7 @@ job-macosx-ninja-novideo:
- !reference [.rules-merge-request-manual, rules]
- if: $NIGHTLY_MASTER
variables:
CMAKE_OPTIONS: -DENABLE_VIDEO=OFF -DENABLE_PQCRYPTO=OFF
CMAKE_OPTIONS: -DPython3_ROOT_DIR=/opt/bc/pip-packages/ -DENABLE_VIDEO=OFF -DENABLE_PQCRYPTO=OFF
CMAKE_GENERATOR: Ninja
extends: .job-macosx-desktop
@ -90,7 +90,7 @@ job-macosx-ninja-novideo:
# WAIT for QT6 for arm64
job-macosx-makefile-package:
stage: package
tags: [ "macos-xcode13" ]
tags: [ "macos-min-xcode12.2" ]
dependencies: []
rules:
- !reference [.rules-merge-request-manual, rules]
@ -98,7 +98,7 @@ job-macosx-makefile-package:
- if: $PACKAGE_MACOSX
- if: $DEPLOY_MACOSX
variables:
CMAKE_OPTIONS: -DENABLE_APP_PACKAGING=ON -DENABLE_GPL_THIRD_PARTIES=ON -DENABLE_G729=ON
CMAKE_OPTIONS: -DPython3_ROOT_DIR=/opt/bc/pip-packages/ -DENABLE_APP_PACKAGING=ON -DENABLE_GPL_THIRD_PARTIES=ON -DENABLE_G729=ON
RELEASE_FILE: -DLINPHONE_SDK_MAKE_RELEASE_FILE_URL=$MAKE_RELEASE_FILE_URL/$MACOSX_PLATFORM/$APP_FOLDER
extends: job-macosx-makefile
script:
@ -113,7 +113,7 @@ job-macosx-makefile-package:
job-macosx-codesigning:
stage: signing
tags: [ "macos-xcode13" ]
tags: [ "macos-min-xcode12.2" ]
needs:
- job-macosx-makefile-package
rules:
@ -165,7 +165,7 @@ job-macosx-makefile-deploy:
job-macosx-makefile-plugins-deploy:
stage: deploy
tags: [ "macos-xcode13" ]
tags: [ "macos-min-xcode12.2" ]
needs:
- job-macosx-makefile
only:

1
CMakeLists.txt
View file

@ -198,6 +198,7 @@ endif()
# Set some SDK variables to configure the APP build as we want it
set(ENABLE_CXX_WRAPPER ON CACHE BOOL "Build the C++ wrapper for Liblinphone." FORCE)
set(ENABLE_THEORA OFF)
set(ENABLE_SCREENSHARING OFF) ## Implemented on master_5 but only activated in 6.0
set(ENABLE_QT_GL ${ENABLE_VIDEO})
# Qt5.13 because of Spitview