diff --git a/.gitlab-ci-files/linux-desktop-ubuntu-2004.yml b/.gitlab-ci-files/linux-desktop-ubuntu-2004.yml index 6c7bf638f..a360bd9ad 100644 --- a/.gitlab-ci-files/linux-desktop-ubuntu-2004.yml +++ b/.gitlab-ci-files/linux-desktop-ubuntu-2004.yml @@ -34,21 +34,23 @@ ubuntu2004-makefile-gcc: ubuntu2004-ninja-clang: rules: - !reference [.rules-merge-request-manual, rules] - - if: $NIGHTLY_MASTER && $SKIP_LINUX != 1 + - if: $NIGHTLY_MASTER variables: CMAKE_OPTIONS: -DENABLE_DOC=ON -DENABLE_G729=ON -DENABLE_PQCRYPTO=ON -DENABLE_GPL_THIRD_PARTIES=ON CMAKE_GENERATOR: Ninja CC: clang CXX: clang++ extends: .linux-desktop + allow_failure: true <<: *docker_image_platform_and_runner_tag ubuntu2004-ninja-clang-small: rules: - !reference [.rules-merge-request-manual, rules] - - if: $NIGHTLY_MASTER && $SKIP_LINUX != 1 + - if: $NIGHTLY_MASTER variables: CMAKE_OPTIONS: -DENABLE_VIDEO=NO -DENABLE_ADVANCED_IM=NO -DENABLE_DB_STORAGE=NO -DENABLE_PQCRYPTO=OFF + allow_failure: true extends: ubuntu2004-ninja-clang ubuntu2004-makefile-gcc: diff --git a/external/linphone-sdk b/external/linphone-sdk index b10321bb7..1a5f228ee 160000 --- a/external/linphone-sdk +++ b/external/linphone-sdk @@ -1 +1 @@ -Subproject commit b10321bb77faacf2924eabb41b0f57721408cf26 +Subproject commit 1a5f228ee786945af74e80803a5c4f9be6534910