From f5c939d671646b96325550a48b3df3ecf95607c3 Mon Sep 17 00:00:00 2001 From: gaelle Date: Mon, 3 Mar 2025 15:06:50 +0100 Subject: [PATCH] remove clang compile --- .gitlab-ci-files/linux-desktop-ubuntu-2004.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci-files/linux-desktop-ubuntu-2004.yml b/.gitlab-ci-files/linux-desktop-ubuntu-2004.yml index aeedb1d0f..bc7a2c02c 100644 --- a/.gitlab-ci-files/linux-desktop-ubuntu-2004.yml +++ b/.gitlab-ci-files/linux-desktop-ubuntu-2004.yml @@ -34,8 +34,7 @@ ubuntu2004-makefile-gcc: ubuntu2004-ninja-clang: rules: - !reference [.rules-merge-request-manual, rules] - - if: $NIGHTLY_MASTER - - if: $LINUX_NINJA + - if: $NIGHTLY_MASTER && $LINUX_NINJA variables: CMAKE_OPTIONS: -DENABLE_DOC=ON -DENABLE_G729=ON -DENABLE_PQCRYPTO=ON -DENABLE_GPL_THIRD_PARTIES=ON CMAKE_GENERATOR: Ninja @@ -47,8 +46,7 @@ ubuntu2004-ninja-clang: ubuntu2004-ninja-clang-small: rules: - !reference [.rules-merge-request-manual, rules] - - if: $NIGHTLY_MASTER - - if: $LINUX_NINJA + - if: $NIGHTLY_MASTER && $LINUX_NINJA variables: CMAKE_OPTIONS: -DENABLE_VIDEO=NO -DENABLE_ADVANCED_IM=NO -DENABLE_DB_STORAGE=NO -DENABLE_PQCRYPTO=OFF extends: ubuntu2004-ninja-clang