.gitlab-ci-files/.choose_upload_dir.yml

@@ -8,7 +8,7 @@
 .choose_variable_from_git_tag:
   stage: deploy
   rules:
-    - if: $DEPLOY_RUN_TEST
+    - if: $DEPLOY_RUN_TEST != null
   tags: [ "macmini-m1-xcode13" ]
   script:
 
@@ -59,7 +59,7 @@
 .choose_upload_dir:
   stage: deploy
   rules:
-    - if: $DEPLOY_RUN_TEST
+    - if: $DEPLOY_RUN_TEST != null
   tags: [ "macmini-m1-xcode13" ]
   script:
     - SNAPSHOTS_LOCATION=$DEPLOY_SNAPSHOTS_ROOT_DIRECTORY
@@ -77,7 +77,7 @@
 .choose_url_macos:
   stage: deploy
   rules:
-    - if: $DEPLOY_RUN_TEST
+    - if: $DEPLOY_RUN_TEST != null
   tags: [ "macmini-m1-xcode13" ]
   script:
     - SNAPSHOTS_LOCATION=$MACOS_SNAPSHOTS_URL
@@ -95,7 +95,7 @@
 .choose_url_ios:
   stage: deploy
   rules:
-    - if: $DEPLOY_RUN_TEST
+    - if: $DEPLOY_RUN_TEST != null
   tags: [ "macmini-m1-xcode13" ]
   script:
     - SNAPSHOTS_LOCATION=$IOS_SNAPSHOTS_URL

.gitlab-ci-files/android/builds.yml

@@ -19,15 +19,15 @@ recache-android:
         - .gradle/wrapper
         - .gradle/caches
 
+  rules:
+    - !reference [.rules-merge-request-manual, rules]
+    - if: $ALL_ANDROID_BUILDS != null
+
   variables:
     CCACHE_SIZE: 4G
 
   extends: .linux-prepare
 
-  rules:
-    - if: ($CI_PIPELINE_SOURCE == "merge_request_event") && $DOCKER_UPDATE == null && $SKIP_ANDROID == null
-    - if: ($CI_PIPELINE_SOURCE == "schedule") && $DOCKER_UPDATE == null && $SKIP_ANDROID == null
-
   script:
     - echo $CMAKE_GENERATOR
     - echo $ANDROID_ARCHS
@@ -69,7 +69,9 @@ recache-android:
 #################################################
 
 android-ninja-r25b:
-
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $DOCKER_UPDATE == null && $SKIP_LINUX == null
+    - if: ($CI_PIPELINE_SOURCE == "schedule") && $DOCKER_UPDATE == null && $SKIP_ANDROID == null
   image: !reference [.android_r25b_image_version, image]
   variables:
     CMAKE_GENERATOR: Ninja
@@ -81,14 +83,15 @@ android-ninja-r25b:
   needs:
     - wait-cache-synchro-android
 
+
+
 android-makefile-r25b-g729-ldap:
   rules:
     - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
-    - if: $NIGHTLY_RELEASE
-    - if: $DEPLOY_RUN_ANDROID
-    - if: $DEPLOY_RUN_NUGET
-    - if: $UPLOAD_XAMARIN
+    - if: $ALL_ANDROID_BUILDS != null
+    - if: $DEPLOY_RUN_ANDROID != null
+    - if: $DEPLOY_RUN_NUGET != null
+    - if: $UPLOAD_XAMARIN != null
 
   variables:
     CMAKE_GENERATOR: Unix Makefiles
@@ -97,10 +100,9 @@ android-makefile-r25b-g729-ldap:
 
 android-ninja-r25b-minimal-size:
   rules:
+    - if: $DEPLOY_RUN_ANDROID != null
     - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
-    - if: $NIGHTLY_RELEASE
-    - if: $DEPLOY_RUN_ANDROID
+    - if: $ALL_ANDROID_BUILDS != null
   variables:
     ANDROID_ARCHS: $ANDROID_ARCHS_MINIMAL_SIZE
     CMAKE_OPTIONS: -DENABLE_VIDEO=OFF -DENABLE_ADVANCED_IM=OFF -DENABLE_DB_STORAGE=OFF -DENABLE_VCARD=OFF -DENABLE_MKV=OFF -DENABLE_CAMERA2=OFF -DENABLE_ASSETS=OFF -DENABLE_LIME_X3DH=OFF -DENABLE_QRCODE=OFF -DENABLE_JPEG=OFF -DENABLE_ZLIB=OFF -DENABLE_SQLITE=OFF -DENABLE_XML2=OFF -DENABLE_ZRTP=OFF
@@ -116,9 +118,9 @@ android-ninja-r25b-no-video:
   image: !reference [.android_r25b_image_version, image]
   rules:
     - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
-    - if: $NIGHTLY_RELEASE
-    - if: $DEPLOY_RUN_ANDROID
+    - if: $ALL_ANDROID_BUILDS != null
+    - if: $DEPLOY_ANDROID != null
+    - if: $DEPLOY_RUN_ANDROID != null
   variables:
     CMAKE_GENERATOR: Ninja
     CMAKE_OPTIONS: -DENABLE_VIDEO=OFF
@@ -127,7 +129,8 @@ android-ninja-r25b-no-video:
 #android-ninja-r25b-macos:
 #  tags: [ "macosx" ]
 # rules:
-#   - if: $NIGHTLY_MASTER
+#   - !reference [.rules-merge-request-manual, rules]
+#   - if: $ALL_ANDROID_BUILDS != null
 #  variables:
 #    CMAKE_GENERATOR: Ninja
 #  extends: .android
@@ -135,7 +138,7 @@ android-ninja-r25b-no-video:
 android-ninja-r25b-smallsdk:
   rules:
     - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
+    - if: $ALL_ANDROID_BUILDS != null
   variables:
     CMAKE_OPTIONS: -DENABLE_VIDEO=OFF -DENABLE_ADVANCED_IM=OFF -DENABLE_DB_STORAGE=OFF
   extends: android-ninja-r25b
@@ -143,10 +146,9 @@ android-ninja-r25b-smallsdk:
 android-ninja-r25b-allcodecs:
   rules:
     - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
+    - if: $ALL_ANDROID_BUILDS != null
   variables:
     CMAKE_OPTIONS: -DENABLE_GPL_THIRD_PARTIES=ON -DENABLE_NON_FREE_FEATURES=ON -DENABLE_G729=ON
-
   extends: android-ninja-r25b
 
 #android-ninja-r25b-sanitizer:
@@ -157,7 +159,7 @@ android-ninja-r25b-allcodecs:
 android-ninja-r25b-pqc:
   rules:
     - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
+    - if: $ALL_ANDROID_BUILDS != null
   variables:
     CMAKE_OPTIONS: -DENABLE_NON_FREE_FEATURES=ON -DENABLE_PQCRYPTO=ON
   extends: android-ninja-r25b

.gitlab-ci-files/android/tests.yml

@@ -10,7 +10,7 @@ liblinphone-android-r25b-test:
   needs:
     - android-ninja-r25b
   rules:
-    - if: $ENABLE_ANDROID_TESTS
+    - if: $ENABLE_ANDROID_TESTS != null
   script:
     - cd ${CI_PROJECT_DIR}/tester/Android
     # uninstalling tester apps on device to prevent conflicts, but running anyway if there isn't some found.

.gitlab-ci-files/android/uploads.yml

@@ -4,9 +4,8 @@
   image: !reference [.android_r25b_image_version, image]
 
   rules:
-    - if: $DEPLOY_RUN_ANDROID
-    - if: $NIGHTLY_MASTER && $SKIP_DEPLOY == null
-    - if: $NIGHTLY_RELEASE
+    - if: $DEPLOY_RUN_ANDROID != null
+    - if: $DEPLOY_ANDROID != null && $SKIP_DEPLOY == null
 
   variables:
     CCACHE_SIZE: 4G
@@ -40,9 +39,8 @@ android-doc-upload:
   image: !reference [.android_r25b_image_version, image]
 
   rules:
-    - if: $DEPLOY_RUN_ANDROID
-    - if: $NIGHTLY_MASTER && $SKIP_DEPLOY == null
-    - if: $NIGHTLY_RELEASE
+    - if: $DEPLOY_RUN_ANDROID != null
+    - if: $DEPLOY_ANDROID != null && $SKIP_DEPLOY == null
 
   variables:
     CCACHE_SIZE: 4G

.gitlab-ci-files/iOS/builds.yml

@@ -4,6 +4,10 @@
   stage: build
   tags: [ "macosx-min-xcode12.2" ]
 
+  rules:
+    - !reference [.rules-merge-request-manual, rules]
+    - if: $ALL_IOS_BUILDS != null
+
   before_script:
     - export CCACHE_BASEDIR=${PWD}
     - export CCACHE_DIR=~/Library/Preferences/ccache-linphone-sdk-master
@@ -54,11 +58,6 @@
 
 
 ios-makefile:
-  rules:
-    - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
-    - if: $NIGHTLY_RELEASE
-
   variables:
     CMAKE_GENERATOR: Unix Makefiles
     CMAKE_OPTIONS: -DENABLE_SWIFT_WRAPPER=OFF
@@ -74,10 +73,8 @@ ios-makefile:
 
 
 ios-ninja:
-
   rules:
     - if: ($CI_PIPELINE_SOURCE == "merge_request_event" || $CI_PIPELINE_SOURCE == "schedule") && $DOCKER_UPDATE == null && $SKIP_IOS == null
-
   variables:
     CMAKE_GENERATOR: Ninja
     ARCHS_OPTIONS: $IOS_ARCHS
@@ -87,9 +84,7 @@ ios-ninja:
 ios-ninja-allcodecs:
   rules:
     - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
-    - if: $NIGHTLY_RELEASE
-
+    - if: $ALL_IOS_BUILDS != null
   variables:
     CMAKE_GENERATOR: Ninja
     ARCHS_OPTIONS: $IOS_ARCHS
@@ -98,12 +93,9 @@ ios-ninja-allcodecs:
 
 
 ios-ninja-g729:
-
   rules:
     - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
-    - if: $NIGHTLY_RELEASE
-
+    - if: $ALL_IOS_BUILDS != null
   variables:
     CMAKE_OPTIONS: -DENABLE_GPL_THIRD_PARTIES=ON -DENABLE_G729=ON
   extends: ios-ninja
@@ -112,9 +104,7 @@ ios-ninja-g729:
 ios-ninja-novideo:
   rules:
     - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
-    - if: $NIGHTLY_RELEASE
-
+    - if: $ALL_IOS_BUILDS != null
   variables:
     CMAKE_OPTIONS: -DENABLE_VIDEO=OFF
   extends: ios-ninja
@@ -123,9 +113,7 @@ ios-ninja-novideo:
 ios-ninja-smallsdk:
   rules:
     - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
-    - if: $NIGHTLY_RELEASE
-
+    - if: $ALL_IOS_BUILDS != null
   variables:
     CMAKE_OPTIONS: -DENABLE_VIDEO=OFF -DENABLE_ADVANCED_IM=OFF -DENABLE_DB_STORAGE=OFF -DENABLE_FLEXIAPI=OFF
   extends: ios-ninja
@@ -134,7 +122,7 @@ ios-ninja-smallsdk:
 ios-ninja-pqc:
   rules:
     - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
+    - if: $ALL_IOS_BUILDS != null
   variables:
     CMAKE_OPTIONS: -DENABLE_NON_FREE_FEATURES=ON -DENABLE_PQCRYPTO=ON
   extends: ios-ninja
@@ -146,12 +134,11 @@ ios-ninja-pqc:
 ios-xcode:
   rules:
     - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
-    - if: $NIGHTLY_RELEASE
-    - if: $DEPLOY_RUN_IOS
-    - if: $DEPLOY_RUN_NUGET
-    - if: $UPLOAD_XAMARIN
-    - if: $ENABLE_IOS_TESTS
+    - if: $ALL_IOS_BUILDS != null
+    - if: $DEPLOY_IOS != null
+    - if: $DEPLOY_RUN_NUGET != null
+    - if: $UPLOAD_XAMARIN != null
+    - if: $ENABLE_IOS_TESTS != null
 
   variables:
     CMAKE_GENERATOR: Xcode
@@ -180,11 +167,8 @@ ios-xcode:
 ios-xcode-novideo:
   rules:
     - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
-    - if: $NIGHTLY_RELEASE
-    - if: $DEPLOY_RUN_IOS
-
-
+    - if: $ALL_IOS_BUILDS != null
+    - if: $DEPLOY_IOS != null
   variables:
     CMAKE_GENERATOR: Xcode
     CMAKE_OPTIONS: -DENABLE_SWIFT_WRAPPER=ON -DENABLE_VIDEO=OFF
@@ -211,7 +195,7 @@ ios-xcode-novideo:
 ios-xcode-pqc:
   rules:
     - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
+    - if: $ALL_IOS_BUILDS != null
 
   variables:
     CMAKE_OPTIONS: -DENABLE_SWIFT_WRAPPER=ON -DENABLE_NON_FREE_FEATURES=ON -DENABLE_PQCRYPTO=ON

.gitlab-ci-files/iOS/tests.yml

@@ -10,7 +10,7 @@ liblinphone-iOS-test:
     - ios-xcode
 
   rules:
-    - if: $ENABLE_IOS_TESTS
+    - if: $ENABLE_IOS_TESTS != null
 
   variables:
     LOG_PATTERN: "logLiblinphoneIos"

.gitlab-ci-files/iOS/uploads.yml

@@ -11,9 +11,7 @@
     GIT_FETCH_EXTRA_FLAGS: --tags --force --recurse-submodules=yes
     GIT_SUBMODULE_UPDATE_FLAGS: --jobs 8 --force --recursive
   rules:
-    - if: $DEPLOY_RUN_IOS
-    - if: $NIGHTLY_MASTER && $SKIP_DEPLOY == null
-    - if: $NIGHTLY_RELEASE
+    - if: $DEPLOY_IOS != null && $SKIP_DEPLOY == null
   needs:
     - ios-xcode
 

.gitlab-ci-files/linux-desktop/doc-uploads.yml

@@ -3,7 +3,7 @@ debian-doc-upload:
   tags: [ "deploy" ]
 
   rules:
-    - if: $UPLOAD_C_CPP_DOC && $SKIP_DEPLOY == null
+    - if: $UPLOAD_C_CPP_DOC != null && $SKIP_DEPLOY == null
 
   variables:
     GIT_FETCH_EXTRA_FLAGS: --tags --force --recurse-submodules=yes
@@ -45,7 +45,7 @@ bzrtp-doc-upload:
   tags: [ "deploy" ]
 
   rules:
-    - if: $UPLOAD_BZRTP_DOC && $SKIP_DEPLOY == null
+    - if: $UPLOAD_BZRTP_DOC != null && $SKIP_DEPLOY == null
 
   variables:
     GIT_FETCH_EXTRA_FLAGS: --tags --force --recurse-submodules=yes
@@ -85,7 +85,7 @@ lime-doc-upload:
   tags: [ "deploy" ]
 
   rules:
-    - if: $UPLOAD_LIME_DOC && $SKIP_DEPLOY == null
+    - if: $UPLOAD_LIME_DOC != null && $SKIP_DEPLOY == null
 
   variables:
     GIT_FETCH_EXTRA_FLAGS: --tags --force --recurse-submodules=yes

.gitlab-ci-files/linux-desktop/linux-desktop-archlinux-latest.yml

@@ -27,9 +27,6 @@ arch-latest-makefile-gcc:
 
   tags: [ "docker" ]
   image: !reference [.archlinux_image_version, image]
-  rules:
-    - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
   variables:
     CMAKE_GENERATOR: Unix Makefiles
     CC: gcc
@@ -41,9 +38,6 @@ arch-latest-makefile-clang:
 
   tags: [ "docker" ]
   image: !reference [.archlinux_image_version, image]
-  rules:
-    - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
   variables:
     CMAKE_GENERATOR: Unix Makefiles
     CC: clang
@@ -57,12 +51,8 @@ arch-latest-makefile-clang:
 
 
 arch-latest-ninja-gcc:
-
   tags: [ "docker" ]
   image: !reference [.archlinux_image_version, image]
-  rules:
-    - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
   variables:
     CMAKE_GENERATOR: Ninja
     CC: gcc
@@ -70,19 +60,11 @@ arch-latest-ninja-gcc:
   extends: .linux-desktop
 
 arch-latest-ninja-gcc-novideo:
-  tags: [ "docker" ]
-  rules:
-    - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
   variables:
     CMAKE_OPTIONS: -DENABLE_VIDEO=OFF
   extends: arch-latest-ninja-gcc
 
 arch-latest-ninja-gcc-pqc:
-  tags: [ "docker" ]
-  rules:
-    - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
   variables:
     CMAKE_OPTIONS: -DENABLE_NON_FREE_FEATURES=ON -DENABLE_PQCRYPTO=ON
   extends: arch-latest-ninja-gcc
@@ -106,16 +88,16 @@ arch-latest-ninja-clang:
 
 arch-latest-ninja-clang-novideo:
   rules:
+    - if: $CI_PIPELINE_SOURCE == "schedule" && $ALL_LINUX_BUILDS != null && $DOCKER_UPDATE == null && $SKIP_LINUX == null
     - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
   variables:
     CMAKE_OPTIONS: -DENABLE_VIDEO=OFF
   extends: arch-latest-ninja-clang
 
 arch-latest-ninja-clang-pqc:
   rules:
+    - if: $CI_PIPELINE_SOURCE == "schedule" && $ALL_LINUX_BUILDS != null && $DOCKER_UPDATE == null && $SKIP_LINUX == null
     - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
   variables:
     CMAKE_OPTIONS: -DENABLE_NON_FREE_FEATURES=ON -DENABLE_PQCRYPTO=ON
   extends: arch-latest-ninja-clang

.gitlab-ci-files/linux-desktop/linux-desktop-debian10.yml

@@ -5,6 +5,7 @@ wait-cache-synchro-debian10:
 
 recache-debian10:
   extends: .recache-update-cache
+  allow_failure: true
   image: !reference [.debian10_image_version, image]
 
 #Build template to use in other job scripts without having to copy same code
@@ -27,9 +28,6 @@ debian10-makefile-gcc:
 
   tags: [ "docker" ]
   image: !reference [.debian10_image_version, image]
-  rules:
-    - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
   variables:
     CMAKE_GENERATOR: Unix Makefiles
     CC: gcc
@@ -43,9 +41,6 @@ debian10-makefile-clang:
 
   tags: [ "docker" ]
   image: !reference [.debian10_image_version, image]
-  rules:
-    - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
   variables:
     CMAKE_GENERATOR: Unix Makefiles
     CC: clang
@@ -74,42 +69,22 @@ debian10-ninja-gcc:
     - wait-cache-synchro-debian10
 
 debian10-ninja-gcc-novideo:
-
-  rules:
-    - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
   variables:
     CMAKE_OPTIONS: -DENABLE_VIDEO=OFF -DENABLE_LDAP=OFF
   extends: debian10-ninja-gcc
 
-
 debian10-ninja-gcc-smallsdk:
-
-  rules:
-    - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
-
   variables:
     CMAKE_OPTIONS: -DENABLE_VIDEO=OFF -DENABLE_ADVANCED_IM=OFF -DENABLE_DB_STORAGE=OFF -DENABLE_FLEXIAPI=OFF -DENABLE_LDAP=OFF
   extends: debian10-ninja-gcc
 
 debian10-ninja-gcc-pqc:
-  rules:
-    - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
-
   variables:
     CMAKE_OPTIONS: -DENABLE_NON_FREE_FEATURES=ON -DENABLE_PQCRYPTO=ON -DENABLE_LDAP=OFF
   extends: debian10-ninja-gcc
 
-
-
 debian10-ninja-clang:
-
   tags: [ "docker" ]
-  rules:
-    - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
   image: !reference [.debian10_image_version, image]
   variables:
     CMAKE_GENERATOR: Ninja
@@ -128,17 +103,11 @@ debian10-ninja-clang-sanitizer:
   extends: debian10-ninja-clang
 
 debian10-ninja-clang-novideo:
-  rules:
-    - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
   variables:
     CMAKE_OPTIONS: -DENABLE_VIDEO=OFF -DENABLE_LDAP=OFF
   extends: debian10-ninja-clang
 
 debian10-ninja-clang-pqc:
-  rules:
-    - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
   variables:
     CMAKE_OPTIONS: -DENABLE_NON_FREE_FEATURES=ON -DENABLE_PQCRYPTO=ON -DENABLE_LDAP=OFF
   extends: debian10-ninja-clang

.gitlab-ci-files/linux-desktop/linux-desktop-debian11.yml

@@ -5,6 +5,7 @@ wait-cache-synchro-debian11:
 
 recache-debian11:
   extends: .recache-update-cache
+  allow_failure: true
   image: !reference [.debian11_image_version, image]
 
 #Build template to use in other job scripts without having to copy same code
@@ -27,9 +28,6 @@ debian11-makefile-gcc:
 
   tags: [ "docker" ]
   image: !reference [.debian11_image_version, image]
-  rules:
-    - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
   variables:
     CMAKE_GENERATOR: Unix Makefiles
     CC: gcc
@@ -42,9 +40,6 @@ debian11-makefile-clang:
 
   tags: [ "docker" ]
   image: !reference [.debian11_image_version, image]
-  rules:
-    - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
   variables:
     CMAKE_GENERATOR: Unix Makefiles
     CC: clang
@@ -84,35 +79,22 @@ debian11-ninja-gcc-sequential:
 
 
 debian11-ninja-gcc-novideo:
-  rules:
-    - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
   variables:
     CMAKE_OPTIONS: -DENABLE_VIDEO=OFF -DENABLE_LDAP=OFF
   extends: debian11-ninja-gcc
 
 debian11-ninja-gcc-pqc:
-  rules:
-    - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
   variables:
     CMAKE_OPTIONS: -DENABLE_NON_FREE_FEATURES=ON -DENABLE_PQCRYPTO=ON -DENABLE_LDAP=OFF
   extends: debian11-ninja-gcc
 
 debian11-ninja-gcc-smallsdk:
-  rules:
-    - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
   variables:
     CMAKE_OPTIONS: -DENABLE_VIDEO=OFF -DENABLE_ADVANCED_IM=OFF -DENABLE_DB_STORAGE=OFF -DENABLE_FLEXIAPI=OFF -DENABLE_LDAP=OFF
   extends: debian11-ninja-gcc
 
 
 debian11-ninja-clang:
-
-  rules:
-    - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
   tags: [ "docker" ]
   image: !reference [.debian11_image_version, image]
   variables:

.gitlab-ci-files/linux-desktop/linux-desktop-debian12.yml

@@ -27,9 +27,6 @@ debian12-makefile-gcc:
 
   tags: [ "docker" ]
   image: !reference [.debian12_image_version, image]
-  rules:
-    - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
   variables:
     CMAKE_GENERATOR: Unix Makefiles
     CC: gcc
@@ -42,9 +39,6 @@ debian12-makefile-clang:
 
   tags: [ "docker" ]
   image: !reference [.debian12_image_version, image]
-  rules:
-    - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
   variables:
     CMAKE_GENERATOR: Unix Makefiles
     CC: clang
@@ -72,37 +66,27 @@ debian12-ninja-gcc:
     - wait-cache-synchro-debian12
 
 debian12-ninja-gcc-novideo:
-  rules:
-    - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
   variables:
     CMAKE_OPTIONS: -DENABLE_VIDEO=OFF -DENABLE_LDAP=OFF
   extends: debian12-ninja-gcc
 
 debian12-ninja-gcc-pqc:
-  rules:
-    - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
   variables:
     CMAKE_OPTIONS: -DENABLE_NON_FREE_FEATURES=ON -DENABLE_PQCRYPTO=ON -DENABLE_LDAP=OFF
   extends: debian12-ninja-gcc
 
 debian12-ninja-gcc-smallsdk:
   rules:
-    - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $DOCKER_UPDATE == null && $SKIP_LINUX == null
+    - if: $CI_PIPELINE_SOURCE == "schedule" && $DOCKER_UPDATE == null && $SKIP_LINUX == null
   variables:
     CMAKE_OPTIONS: -DENABLE_VIDEO=OFF -DENABLE_ADVANCED_IM=OFF -DENABLE_DB_STORAGE=OFF -DENABLE_FLEXIAPI=OFF -DENABLE_LDAP=OFF
   extends: debian12-ninja-gcc
 
 
 debian12-ninja-clang:
-
   tags: [ "docker" ]
   image: !reference [.debian12_image_version, image]
-  rules:
-    - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
   variables:
     CMAKE_GENERATOR: Ninja
     CC: clang

.gitlab-ci-files/linux-desktop/linux-desktop-rocky8.yml

@@ -29,9 +29,6 @@ recache-rocky8:
 rocky8-makefile-gcc:
   tags: [ "docker" ]
   image: !reference [.rocky8_image_version, image]
-  rules:
-    - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
   variables:
     CMAKE_GENERATOR: Unix Makefiles
     #Only used to overwrite value set by .set_parallel_level.yml
@@ -202,4 +199,4 @@ liblinphone-rocky8-test-force:
   extends: .test-liblinphone
   <<: *docker_image_needs_platform_devtoolset_libl
   rules:
-    - if: $ENABLE_TESTS_LIBLINPHONE
+    - if: $ENABLE_TESTS_LIBLINPHONE != null

.gitlab-ci-files/linux-desktop/linux-desktop-ubuntu-rolling.yml

@@ -91,14 +91,10 @@ ubuntu-rolling-ninja-clang:
     CC: clang
     CXX: clang++
   rules:
-    - !reference [.rules-merge-request-manual, rules]
-    - if: $CI_PIPELINE_SOURCE == "schedule" && $SKIP_LINUX == null
+    - !reference [.linux-desktop, rules]
   extends: .linux-desktop
 
 ubuntu-rolling-ninja-clang-pqc:
-  rules:
-    - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
   variables:
     CMAKE_OPTIONS: -DENABLE_NON_FREE_FEATURES=ON -DENABLE_PQCRYPTO=ON
   extends: ubuntu-rolling-ninja-clang

.gitlab-ci-files/linux-desktop/linux-desktop-ubuntu2004.yml

@@ -3,7 +3,7 @@ wait-cache-synchro-ubuntu2004:
   variables:
     BUILD_SUBTYPE: ubuntu2004
 
-recache-ubuntuubuntu2004:
+recache-ubuntu2004:
   extends: .recache-update-cache
   image: !reference [.ubuntu2004_image_version, image]
 
@@ -12,35 +12,29 @@ recache-ubuntuubuntu2004:
 #Use = "<< *referenceName" to use the template ("-*" in script)
 
 
-.factorize_ubuntu2004: &docker_image_platform_and_runner_tag_rules
+.factorize_ubuntu2004: &docker_image_platform_and_runner_tag
   tags: [ "docker-test" ]
   image: !reference [.ubuntu2004_image_version, image]
   needs:
-    - ubuntu2004-ninja-gcc
+    - ubuntu2004-ninja-gcc-tunnel-pq
   variables:
     PLATFORM: linux-ubuntu2004
-  rules:
-    - !reference [.rules-merge-request-manual, rules]
 
-.factorize_ubuntu2004_s: &docker_image_platform_and_runner_tag_rules_s
+.factorize_ubuntu2004_s: &docker_image_platform_and_runner_tag_s
   tags: [ "docker-sequential" ]
   image: !reference [.ubuntu2004_image_version, image]
   needs:
-    - ubuntu2004-ninja-gcc
+    - ubuntu2004-ninja-gcc-tunnel-pq
   variables:
     PLATFORM: linux-ubuntu2004
-  rules:
-    - !reference [.rules-merge-request-manual, rules]
 
 # "tags" is defined in tester extends (check linux-desktop.yml)
-.factorize_ubuntu2004_libl: &docker_image_platform_and_runner_tag_rules_libl
+.factorize_ubuntu2004_libl: &docker_image_platform_and_runner_tag_libl
   image: !reference [.ubuntu2004_test_libl_image_version, image]
   needs:
-    - ubuntu2004-ninja-gcc
+    - ubuntu2004-ninja-gcc-tunnel-pq
   variables:
     PLATFORM: linux-ubuntu2004
-  rules:
-    - !reference [.rules-merge-request-manual, rules]
 
 #################################################
 # Makefile
@@ -49,9 +43,6 @@ recache-ubuntuubuntu2004:
 ubuntu2004-makefile-clang:
   tags: [ "docker" ]
   image: !reference [.ubuntu2004_image_version, image]
-  rules:
-    - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
   variables:
     CMAKE_GENERATOR: Unix Makefiles
     CC: clang
@@ -61,9 +52,6 @@ ubuntu2004-makefile-clang:
   extends: .linux-desktop
 
 ubuntu2004-makefile-clang-pqc:
-  rules:
-    - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
   variables:
     CMAKE_OPTIONS: -DENABLE_NON_FREE_FEATURES=ON -DENABLE_PQCRYPTO=ON -DENABLE_LDAP=ON
   extends: ubuntu2004-makefile-clang
@@ -79,8 +67,8 @@ ubuntu2004-ninja-gcc:
     GIT_FETCH_EXTRA_FLAGS: --tags --force --recurse-submodules=yes
     GIT_SUBMODULE_UPDATE_FLAGS: --jobs 8 --force --recursive
   rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $DOCKER_UPDATE == null && $SKIP_LINUX == null
-    - if: $CI_PIPELINE_SOURCE == "schedule" && $DOCKER_UPDATE == null && $SKIP_LINUX == null
+    - if: $CI_PIPELINE_SOURCE == "schedule" && $ALL_LINUX_BUILDS != null && $DOCKER_UPDATE == null && $SKIP_LINUX == null
+    - !reference [.rules-merge-request-manual, rules]
   variables:
     CMAKE_OPTIONS: -DENABLE_DOC=ON -DENABLE_LDAP=ON -DENABLE_QT_GL=ON
     CMAKE_GENERATOR: Ninja
@@ -96,12 +84,6 @@ ubuntu2004-ninja-gcc:
     - wait-cache-synchro-ubuntu2004
 
 ubuntu2004-ninja-gcc-pqc:
-  rules:
-    - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
-    - if: $ENABLE_LINUX_TESTS
-    - if: $SKIP_LINUX
-      when: never
   variables:
     CMAKE_OPTIONS: -DENABLE_NON_FREE_FEATURES=ON -DENABLE_PQCRYPTO=ON -DENABLE_LDAP=ON
   extends: ubuntu2004-ninja-gcc
@@ -109,12 +91,12 @@ ubuntu2004-ninja-gcc-pqc:
 ubuntu2004-ninja-gcc-smallsdk:
   variables:
     CMAKE_OPTIONS: -DENABLE_VIDEO=OFF -DENABLE_ADVANCED_IM=OFF -DENABLE_DB_STORAGE=OFF -DENABLE_FLEXIAPI=OFF -DENABLE_LDAP=OFF -DENABLE_QRCODE=OFF
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $DOCKER_UPDATE == null && $SKIP_LINUX == null
-    - if: $CI_PIPELINE_SOURCE == "schedule" && $DOCKER_UPDATE == null && $SKIP_LINUX == null
   extends: ubuntu2004-ninja-gcc
 
 ubuntu2004-ninja-gcc-tunnel-pq:
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "schedule" && $ALL_LINUX_BUILDS != null && $DOCKER_UPDATE == null && $SKIP_LINUX == null
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $DOCKER_UPDATE == null && $SKIP_LINUX == null
   variables:
     CMAKE_OPTIONS: -DENABLE_LDAP=ON -DENABLE_NON_FREE_FEATURES=ON -DENABLE_PQCRYPTO=ON -DENABLE_UNIT_TESTS=ON -DENABLE_TUNNEL=ON
   extends: ubuntu2004-ninja-gcc
@@ -125,55 +107,55 @@ ubuntu2004-ninja-gcc-tunnel-pq:
 
 bctoolbox-ubuntu2004-test:
   extends: .test-bctoolbox
-  <<: *docker_image_platform_and_runner_tag_rules
+  <<: *docker_image_platform_and_runner_tag
 
 bellesip-ubuntu2004-test:
   extends: .test-bellesip
-  <<: *docker_image_platform_and_runner_tag_rules_s
+  <<: *docker_image_platform_and_runner_tag_s
 
 belr-ubuntu2004-test:
   extends: .test-belr
-  <<: *docker_image_platform_and_runner_tag_rules
+  <<: *docker_image_platform_and_runner_tag
 
 belcard-ubuntu2004-test:
   extends: .test-belcard
-  <<: *docker_image_platform_and_runner_tag_rules
+  <<: *docker_image_platform_and_runner_tag
 
 bzrtp-ubuntu2004-test:
   extends: .test-bzrtp
-  <<: *docker_image_platform_and_runner_tag_rules
+  <<: *docker_image_platform_and_runner_tag
 
 liblinphone-ubuntu2004-test:
   extends: .test-liblinphone
-  <<: *docker_image_platform_and_runner_tag_rules_libl
+  <<: *docker_image_platform_and_runner_tag_libl
 
 liblinphone-ubuntu2004-test-tunnel-pq:
   extends:
     - .test-liblinphone-tunnel-pq
-  <<: *docker_image_platform_and_runner_tag_rules_libl
+  <<: *docker_image_platform_and_runner_tag_libl
   needs:
     - ubuntu2004-ninja-gcc-tunnel-pq
 
 # liblinphone-ubuntu2004-test-mr:
 #  extends: .test-liblinphone-mr
-#  <<: *docker_image_platform_and_runner_tag_rules_libl
+#  <<: *docker_image_platform_and_runner_tag_libl
 
 liblinphone-ubuntu2004-test-force:
   extends: .test-liblinphone
-  <<: *docker_image_platform_and_runner_tag_rules_libl
+  <<: *docker_image_platform_and_runner_tag_libl
   rules:
-    - if: $ENABLE_TESTS_LIBLINPHONE
+    - if: $ENABLE_TESTS_LIBLINPHONE != null
 
 mediastreamer-ubuntu2004-test:
   extends: .test-mediastreamer
-  <<: *docker_image_platform_and_runner_tag_rules_libl
+  <<: *docker_image_platform_and_runner_tag_libl
 
 ortp-ubuntu2004-test:
   extends: .test-ortp
-  <<: *docker_image_platform_and_runner_tag_rules
+  <<: *docker_image_platform_and_runner_tag
 
 pqc-ubuntu2004-test:
   extends: .test-pqc
-  <<: *docker_image_platform_and_runner_tag_rules
+  <<: *docker_image_platform_and_runner_tag
   needs:
     - ubuntu2004-ninja-gcc-pqc

.gitlab-ci-files/linux-desktop/linux-desktop.yml

@@ -9,8 +9,8 @@
   variables:
     CMAKE_OPTIONS: -DENABLE_LDAP=ON
   rules:
-    - if: ($CI_PIPELINE_SOURCE == "merge_request_event") && $SKIP_LINUX == null
-    - if: ($CI_PIPELINE_SOURCE == "schedule") && $SKIP_LINUX == null
+    - if: $ALL_LINUX_BUILDS != null && $SKIP_LINUX == null
+    - !reference [.rules-merge-request-manual, rules]
   script:
     - export CC=$CC
     - export CXX=$CXX
@@ -40,8 +40,8 @@
   variables:
     CMAKE_OPTIONS: -DENABLE_LDAP=ON
   rules:
-    - if: ($CI_PIPELINE_SOURCE == "merge_request_event") && $SKIP_LINUX == null
-    - if: ($CI_PIPELINE_SOURCE == "schedule") && $SKIP_LINUX == null
+    - if: ($CI_PIPELINE_SOURCE == "schedule") && $ALL_LINUX_BUILDS != null && $SKIP_LINUX == null
+    - !reference [.rules-merge-request-manual, rules]
   script:
     - export CC=$CC
     - export CXX=$CXX
@@ -138,8 +138,9 @@
     GIT_SUBMODULE_STRATEGY: none
     USE_TUNNEL_PQ_TESTS_LIBLINPHONE: "false"
   rules:
-    - if: $ENABLE_LINUX_TESTS
-    - if: $SKIP_LINUX
+    - if: $ENABLE_LINUX_TESTS != null
+    - !reference [.rules-merge-request-manual, rules]
+    - if: $SKIP_LINUX != null
       when: never
 
   script:
@@ -182,11 +183,10 @@
           EXIT_SINGLE_CALL_OVER_TUNNEL_AND_PQ=0;
           EXIT_SECURE_CALL_OVER_TUNNEL_AND_PQ=0;
           EXIT_H264_TAG_OVER_TUNNEL_AND_PQ=0;
-          EXIT_TUNNEL_OVER_TUNNEL_AND_PQ=0;
+          EXIT_OVER_TUNNEL_AND_PQ=0;
 
-          ./$TESTER_BIN --verbose --suite "Single Call" $RESOURCES_DIR --log-file logLiblinphoneSingleCallOverTunnelAndPQThIpv6.txt --xml --xml-file BCUnitAutomatedSingleCall.xml $ADDITIONNAL_OPTIONS || EXIT_SINGLE_CALL_OVER_TUNNEL_AND_PQ=$?
+          ./$TESTER_BIN --verbose --parallel --parallel-max 32 --suite "Single Call" --suite "Secure Call" $RESOURCES_DIR --log-file logLiblinphoneOverTunnelAndPQThIpv6.txt --xml --xml-file BCUnitAutomated-Results.xml $ADDITIONNAL_OPTIONS || EXIT_OVER_TUNNEL_AND_PQ=$?
 
-          ./$TESTER_BIN --verbose --suite "Secure Call" $RESOURCES_DIR --log-file logLiblinphoneSecureCallOverTunnelAndPQThIpv6.txt --xml --xml-file BCUnitAutomatedSecureCall.xml $ADDITIONNAL_OPTIONS || EXIT_SECURE_CALL_OVER_TUNNEL_AND_PQ=$?
           ./$TESTER_BIN --verbose --tag "H264" $RESOURCES_DIR --log-file logLiblinphoneH264OverTunnelAndPQThIpv6.txt --xml --xml-file BCUnitAutomatedH264Tag.xml $ADDITIONNAL_OPTIONS || EXIT_H264_TAG_OVER_TUNNEL_AND_PQ=$?
 
          # ./$TESTER_BIN --verbose --suite "Tunnel" $RESOURCES_DIR --log-file logLiblinphoneTunnelOverTunnelAndPQThIpv6.txt --xml --xml-file BCUnitAutomatedTunnel.xml $ADDITIONNAL_OPTIONS || EXIT_TUNNEL_OVER_TUNNEL_AND_PQ=$?
@@ -199,11 +199,10 @@
         then
           exit $EXIT
         else
-          echo "EXIT_SINGLE_CALL_OVER_TUNNEL_AND_PQ=$EXIT_SINGLE_CALL_OVER_TUNNEL_AND_PQ";
-          echo "EXIT_SECURE_CALL_OVER_TUNNEL_AND_PQ=$EXIT_SECURE_CALL_OVER_TUNNEL_AND_PQ";
+          echo "EXIT_OVER_TUNNEL_AND_PQ=$EXIT_OVER_TUNNEL_AND_PQ";
           echo "EXIT_H264_TAG_OVER_TUNNEL_AND_PQ=$EXIT_SECURE_CALL_OVER_TUNNEL_AND_PQ";
           echo "EXIT_TUNNEL_OVER_TUNNEL_AND_PQ=$EXIT_TUNNEL_OVER_TUNNEL_AND_PQ";
-          if [ $EXIT_SINGLE_CALL_OVER_TUNNEL_AND_PQ != 0 ] || [ $EXIT_SECURE_CALL_OVER_TUNNEL_AND_PQ != 0 ] || [ $EXIT_TUNNEL_OVER_TUNNEL_AND_PQ != 0 ] || [ $EXIT_H264_TAG_OVER_TUNNEL_AND_PQ != 0 ] ;
+          if [ $EXIT_OVER_TUNNEL_AND_PQ != 0 ] || [ $EXIT_H264_TAG_OVER_TUNNEL_AND_PQ != 0 ] ;
           then
             exit 1;
           else

.gitlab-ci-files/macosx/builds.yml → .gitlab-ci-files/macos/builds.yml

-.macosx-desktop:
+.macos-desktop:
   extends: .job-prepare
   stage: build
   tags: [ "macos-xcode13" ]
 
   rules:
-    - if: ($CI_PIPELINE_SOURCE == "merge_request_event") && $DOCKER_UPDATE == null && $SKIP_MACOSX == null
-    - if: $CI_PIPELINE_SOURCE == "schedule" && $DOCKER_UPDATE == null && $SKIP_MACOSX == null
+    - !reference [.rules-merge-request-manual, rules]
+    - if: $ALL_MACOS_BUILDS != null
 
   variables:
     CMAKE_OPTIONS: -DENABLE_LDAP=ON
@@ -24,16 +24,6 @@
     - export CCACHE_DIR=~/Library/Preferences/ccache-linphone-sdk-master
     - ccache -s --verbose
 
-  before_script:
-    - ccache -s
-
-    # We clean the cache stats because it is our only way to see the cache stats per job run (one cleaner way would be to store in a file a do the delta by hand)
-    - ccache -z
-    - ccache -s
-
-  after_script:
-    - ccache -s
-
   script:
     - !reference [.set-max-jobs-unix, script]
     - echo $MACOS_DEPLOY_URL
@@ -62,78 +52,65 @@
     when: always
     expire_in: 1 week
 
-.macosx-m1-multiarch-desktop:
-  tags: [ "macosx-min-xcode12.2" ]
+.macos-m1-multiarch-desktop:
+  tags: [ "macos-min-xcode12.2" ]
   variables:
     LINPHONESDK_MACOS_ARCHS: "arm64, x86_64"
-  extends: .macosx-desktop
+  extends: .macos-desktop
 
 #################################################
 # Makefile
 #################################################
 
-macosx-m1-multiarch-makefile:
-
-  rules:
-    - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
+macos-m1-multiarch-makefile:
   variables:
     CMAKE_GENERATOR: Unix Makefiles
     #Only used to overwrite value set by .set_parallel_level.yml
     #ADDITIONAL_BUILD_OPTIONS: -j[jobs]
-  extends: .macosx-m1-multiarch-desktop
+  extends: .macos-m1-multiarch-desktop
 
-macosx-m1-multiarch-makefile-pqc:
+macos-m1-multiarch-makefile-pqc:
   variables:
     CMAKE_OPTIONS: -DENABLE_LDAP=ON -DENABLE_NON_FREE_FEATURES=ON -DENABLE_PQCRYPTO=ON
-  extends: macosx-m1-multiarch-makefile
+  extends: macos-m1-multiarch-makefile
 
 #################################################
 # Ninja
 #################################################
 
 
-macosx-ninja:
-  rules:
-    - if: ($CI_PIPELINE_SOURCE == "merge_request_event") && $DOCKER_UPDATE == null && $SKIP_MACOSX == null
+macos-ninja:
   variables:
     CMAKE_GENERATOR: Ninja
-    CMAKE_OPTIONS: -DENABLE_UNIT_TESTS=ON -DENABLE_LDAP=ON -DENABLE_EXAMPLE_PLUGIN=ON
-  extends: .macosx-desktop
-
-macosx-m1-multiarch-ninja:
+    CMAKE_OPTIONS: -DENABLE_LDAP=ON -DENABLE_EXAMPLE_PLUGIN=ON
+  extends: .macos-desktop
 
+macos-m1-multiarch-ninja:
   variables:
     CMAKE_GENERATOR: Ninja
     CMAKE_OPTIONS: -DENABLE_UNIT_TESTS=ON -DENABLE_LDAP=ON
-  rules:
-    - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
-  extends: .macosx-m1-multiarch-desktop
+  extends: .macos-m1-multiarch-desktop
 
-macosx-m1-ninja-pqc:
+macos-m1-ninja-pqc-multiarch:
   variables:
-    CMAKE_OPTIONS: -DENABLE_LDAP=ON -DENABLE_NON_FREE_FEATURES=ON -DENABLE_PQCRYPTO=ON -DENABLE_EXAMPLE_PLUGIN=ON
+    CMAKE_OPTIONS: -DENABLE_LDAP=ON -DENABLE_NON_FREE_FEATURES=ON -DENABLE_PQCRYPTO=ON -DENABLE_EXAMPLE_PLUGIN=ON -DENABLE_UNIT_TESTS=ON
   rules:
-    - if: (($CI_PIPELINE_SOURCE == "merge_request_event") && $DOCKER_UPDATE == null && $SKIP_MACOSX == null) || $NIGHTLY_MASTER
-  extends: macosx-m1-multiarch-ninja
-
-macosx-ninja-novideo:
+    - if: ($CI_PIPELINE_SOURCE == "merge_request_event") && $DOCKER_UPDATE == null && $SKIP_MACOS == null
+    - if: $CI_PIPELINE_SOURCE == "schedule" && $DOCKER_UPDATE == null && $SKIP_MACOS == null
+  extends: macos-m1-multiarch-ninja
 
-  rules:
-    - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
+macos-ninja-novideo:
   variables:
     CMAKE_OPTIONS: -DENABLE_VIDEO=OFF -DENABLE_LDAP=ON
-  extends: macosx-ninja
+  extends: macos-ninja
 
 #################################################
 # XCode
 #################################################
 
 
-macosx-xcode:
-  extends: .macosx-desktop
+macos-xcode:
+  extends: .macos-desktop
   variables:
     CMAKE_GENERATOR: Xcode
     #Only used to overwrite value set by .set_parallel_level.yml
@@ -143,14 +120,13 @@ macosx-xcode:
 
   rules:
     - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
-    - if: $NIGHTLY_RELEASE
-    - if: $DEPLOY_RUN_MACOSX
+    - if: $ALL_MACOS_BUILDS != null
+    - if: $DEPLOY_MACOS != null
 
   before_script:
     - CCACHE_CONFIGPATH=~/Library/Preferences/ccache/ccache-xcode.conf
 
-    - !reference [.macosx-desktop, before_script]
+    - !reference [.macos-desktop, before_script]
 
   # All variables declared in "variables" are processed before "before_script" and "script", so declaring XCODE_OPTIONS (path to base URL) in before_script allows to set it dynamically.
   script:
@@ -162,12 +138,12 @@ macosx-xcode:
 
     - XCODE_OPTIONS="-DLINPHONESDK_MACOS_BASE_URL=$MACOS_URL"
 
-    - !reference [.macosx-m1-multiarch-desktop, script]
+    - !reference [.macos-m1-multiarch-desktop, script]
 
-macosx-xcode-pqc:
-  extends: macosx-xcode
+macos-xcode-pqc:
+  extends: macos-xcode
   variables:
     CMAKE_OPTIONS: -DENABLE_LDAP=ON -DENABLE_NON_FREE_FEATURES=ON -DENABLE_PQCRYPTO=ON
   rules:
     - !reference [.rules-merge-request-manual, rules]
-    - if: $NIGHTLY_MASTER
+    - if: $ALL_MACOS_BUILDS != null

.gitlab-ci-files/macosx/tests.yml → .gitlab-ci-files/macos/tests.yml

-macosx-liblinphone-test:
+macos-liblinphone-test:
   stage: test
   extends: .job-prepare
   tags: [ "macmini-m1-xcode12" ]
   allow_failure: true
   needs:
-    - macosx-ninja
+    - macos-ninja
   rules:
-    - if: $ENABLE_MACOSX_TESTS
+    - if: $ENABLE_MACOS_TESTS != null
   variables:
     # no need to fetch repo, all is needed in artifacts
     GIT_STRATEGY: none
@@ -46,7 +46,7 @@ macosx-liblinphone-test:
     - echo $ESCAPED_BRANCH
     - COMMIT=$(git describe)
     - echo $COMMIT
-    - URL=https://$DEPLOY_SERVER_DOMAIN/snapshots/allure-tests-reports/$ESCAPED_BRANCH/$COMMIT-$CI_JOB_ID/macosx/liblinphone/allure-report
+    - URL=https://$DEPLOY_SERVER_DOMAIN/snapshots/allure-tests-reports/$ESCAPED_BRANCH/$COMMIT-$CI_JOB_ID/macos/liblinphone/allure-report
 
     - echo "<\!DOCTYPE HTML>" >> index.html
     - echo "<meta charset=\"UTF-8\">" >> index.html
@@ -61,7 +61,7 @@ macosx-liblinphone-test:
 
     - echo "TEST REPORTS URL $URL"
 
-    - echo "alias URL=https://$DEPLOY_SERVER_DOMAIN/snapshots/allure-tests-reports/$ESCAPED_BRANCH/$GITLAB_USER_LOGIN/$COMMIT-$CI_JOB_ID/macosx/liblinphone/allure-report"
+    - echo "alias URL=https://$DEPLOY_SERVER_DOMAIN/snapshots/allure-tests-reports/$ESCAPED_BRANCH/$GITLAB_USER_LOGIN/$COMMIT-$CI_JOB_ID/macos/liblinphone/allure-report"
 
     #Gathering artifacts in one folder to ease their use
     - if [[ -n $(ls ${CI_PROJECT_DIR} | grep results) ]]; then rm -rf ${CI_PROJECT_DIR}/results/*; else mkdir ${CI_PROJECT_DIR}/results ; fi || true;

.gitlab-ci-files/macosx/uploads.yml → .gitlab-ci-files/macos/uploads.yml

-macosx-upload:
+macos-upload:
   stage: deploy
   tags: [ "macos-xcode13" ]
 
   rules:
-    - if: $DEPLOY_RUN_MACOSX
-    - if: $NIGHTLY_MASTER && $SKIP_DEPLOY == null
-    - if: $NIGHTLY_RELEASE
+    - if: $DEPLOY_MACOS != null
   variables:
     GIT_FETCH_EXTRA_FLAGS: --tags --force --recurse-submodules=yes
     GIT_SUBMODULE_UPDATE_FLAGS: --jobs 8 --force --recursive
   needs:
-    - macosx-xcode
+    - macos-xcode
 
   script:
     - DESCRIBE=$(git -C liblinphone describe)

.gitlab-ci-files/raspberrypi.yml

@@ -8,6 +8,8 @@ wait-cache-synchro-raspberrypi:
 
 recache-raspberrypi:
   extends: .recache-update-cache
+  # Set as this job can only be launched manually in mr, so the cache could be absent
+  allow_failure: true
   image: !reference [.raspios_image_version, image]
 
 
@@ -19,8 +21,8 @@ recache-raspberrypi:
     CMAKE_OPTIONS: -DENABLE_LDAP=ON
     CMAKE_PRESET: raspberrypi-0-1
   rules:
-    - if: ($CI_PIPELINE_SOURCE == "merge_request_event") && $SKIP_LINUX == null
-    - if: ($CI_PIPELINE_SOURCE == "schedule") && $SKIP_LINUX == null
+    - if: $ALL_LINUX_BUILDS != null && $SKIP_LINUX == null
+    - !reference [.rules-merge-request-manual, rules]
   script:
     # rootfs is not created here but mounted as a volume
     # - /home/bc/raspios-create-rootfs.sh