From c3c7424aeb66df1d0dc885a26e22adc7d5dca26b Mon Sep 17 00:00:00 2001
From: Julien Wadel <julien.wadel@belledonne-communications.com>
Date: Fri, 8 Nov 2024 06:48:31 -0500
Subject: [PATCH] ninja

---
 .gitlab-ci-files/macosx-desktop.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci-files/macosx-desktop.yml b/.gitlab-ci-files/macosx-desktop.yml
index bfcc5bd74..4839cc25e 100644
--- a/.gitlab-ci-files/macosx-desktop.yml
+++ b/.gitlab-ci-files/macosx-desktop.yml
@@ -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