This commit is contained in:
Julien Wadel 2024-11-08 06:48:31 -05:00
parent b2e2183701
commit c3c7424aeb

View file

@ -44,6 +44,8 @@
macosx-ninja:
rules:
- if: ($CI_PIPELINE_SOURCE == "merge_request_event") && $DOCKER_UPDATE == null && $SKIP_MACOSX == null
- if: $NIGHTLY_MASTER
- if: $DEPLOY_PLUGINS
variables:
CMAKE_GENERATOR: Ninja
CMAKE_OPTIONS: -DENABLE_PQCRYPTO=OFF
@ -57,7 +59,6 @@ macosx-makefile:
rules:
- !reference [.rules-merge-request-manual, rules]
- if: $NIGHTLY_MASTER
- if: $DEPLOY_PLUGINS
variables:
CMAKE_GENERATOR: Unix Makefiles
CMAKE_OPTIONS: -DENABLE_PQCRYPTO=OFF
@ -89,7 +90,7 @@ macosx-ninja-novideo:
# Package - Nightly
#################################################
# WAIT for QT6 for arm64
macosx-makefile-package:
macosx-ninja-package:
stage: package
tags: [ "macos-xcode15" ]
dependencies: []
@ -102,7 +103,7 @@ macosx-makefile-package:
variables:
CMAKE_OPTIONS: -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: macosx-makefile
extends: macosx-ninja
script:
- if [[ $MAKE_RELEASE_FILE_URL == "" ]]; then export RELEASE_FILE=""; fi
- *build_all_script
@ -117,7 +118,7 @@ macosx-codesigning:
stage: signing
tags: [ "macos-xcode15" ]
needs:
- macosx-makefile-package
- macosx-ninja-package
rules:
- !reference [.rules-merge-request-manual, rules]
- if: $NIGHTLY_MASTER
@ -160,7 +161,7 @@ macosx-makefile-plugins-deploy:
stage: deploy
tags: [ "macos-xcode15" ]
needs:
- macosx-makefile
- macosx-ninja
only:
variables:
- $DEPLOY_PLUGINS