From 7bfc6e0312b61df61ba4c050eb6550758a81db1e Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Mon, 11 Mar 2024 08:51:22 +0100 Subject: [PATCH] CI: deploy on request. Update event count after start. --- .../job-linux-desktop-ubuntu-2004.yml | 8 ++--- .gitlab-ci-files/job-macosx-desktop.yml | 35 +++++++++---------- .gitlab-ci-files/job-windows-desktop.yml | 2 ++ .../src/components/core/CoreManager.cpp | 1 + 4 files changed, 24 insertions(+), 22 deletions(-) diff --git a/.gitlab-ci-files/job-linux-desktop-ubuntu-2004.yml b/.gitlab-ci-files/job-linux-desktop-ubuntu-2004.yml index f41808627..1df9bdbd9 100644 --- a/.gitlab-ci-files/job-linux-desktop-ubuntu-2004.yml +++ b/.gitlab-ci-files/job-linux-desktop-ubuntu-2004.yml @@ -152,10 +152,10 @@ ubuntu2004-makefile-gcc-deploy: tags: [ "deploy" ] needs: - ubuntu2004-makefile-gcc-package - only: - variables: - - $NIGHTLY_MASTER - - $DEPLOY_LINUX + rules: + - !reference [.rules-merge-request-manual, rules] + - if: $NIGHTLY_MASTER + - if: $DEPLOY_LINUX script: # Going to folder in order to avoid having path in checksum - |- diff --git a/.gitlab-ci-files/job-macosx-desktop.yml b/.gitlab-ci-files/job-macosx-desktop.yml index ee456c0ef..d7224210c 100644 --- a/.gitlab-ci-files/job-macosx-desktop.yml +++ b/.gitlab-ci-files/job-macosx-desktop.yml @@ -54,10 +54,9 @@ job-macosx-ninja: ################################################# job-macosx-makefile: - only: - variables: - - $NIGHTLY_MASTER - - $DEPLOY_PLUGINS + rules: + - if: $NIGHTLY_MASTER + - if: $DEPLOY_PLUGINS variables: CMAKE_GENERATOR: Unix Makefiles CMAKE_OPTIONS: -DENABLE_PQCRYPTO=OFF @@ -93,11 +92,11 @@ job-macosx-makefile-package: stage: package tags: [ "macos-xcode13" ] dependencies: [] - only: - variables: - - $NIGHTLY_MASTER - - $PACKAGE_MACOSX - - $DEPLOY_MACOSX + rules: + - !reference [.rules-merge-request-manual, rules] + - if: $NIGHTLY_MASTER + - if: $PACKAGE_MACOSX + - if: $DEPLOY_MACOSX 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 @@ -117,11 +116,11 @@ job-macosx-codesigning: tags: [ "macos-xcode13" ] needs: - job-macosx-makefile-package - only: - variables: - - $NIGHTLY_MASTER - - $PACKAGE_MACOSX - - $DEPLOY_MACOSX + rules: + - !reference [.rules-merge-request-manual, rules] + - if: $NIGHTLY_MASTER + - if: $PACKAGE_MACOSX + - if: $DEPLOY_MACOSX script: - cd build - codesign --timestamp --options runtime,library --verbose -s "$MACOS_SIGNING_IDENTITY" OUTPUT/linphone-app/macos/Packages/Linphone*.dmg @@ -142,10 +141,10 @@ job-macosx-makefile-deploy: tags: [ "deploy" ] needs: - job-macosx-codesigning - only: - variables: - - $NIGHTLY_MASTER - - $DEPLOY_MACOSX + rules: + - !reference [.rules-merge-request-manual, rules] + - if: $NIGHTLY_MASTER + - if: $DEPLOY_MACOSX script: # Going to folder in order to avoid having path in checksum - |- diff --git a/.gitlab-ci-files/job-windows-desktop.yml b/.gitlab-ci-files/job-windows-desktop.yml index f47971fe9..c3bd56fc8 100644 --- a/.gitlab-ci-files/job-windows-desktop.yml +++ b/.gitlab-ci-files/job-windows-desktop.yml @@ -153,6 +153,7 @@ vs2019-win64-package: extends: .windows-vs2019-msvc dependencies: [] rules: + - !reference [.rules-merge-request-manual, rules] - if: $NIGHTLY_MASTER - if: $NIGHTLY_RELEASE - if: $PACKAGE_WINDOWS @@ -169,6 +170,7 @@ vs2019-win64-upload: stage: deploy tags: [ "deploy"] rules: + - !reference [.rules-merge-request-manual, rules] - if: $NIGHTLY_MASTER - if: $DEPLOY_WINDOWS needs: diff --git a/linphone-app/src/components/core/CoreManager.cpp b/linphone-app/src/components/core/CoreManager.cpp index daf3d0471..59863e460 100644 --- a/linphone-app/src/components/core/CoreManager.cpp +++ b/linphone-app/src/components/core/CoreManager.cpp @@ -114,6 +114,7 @@ void CoreManager::initCoreManager(){ qInfo() << QStringLiteral("CoreManager initialized"); emit coreManagerInitialized(); + emit eventCountChanged(); } bool CoreManager::isInitialized() const{