From 85b458feebfe6b623ae6a4c9999fed2362b0928b Mon Sep 17 00:00:00 2001 From: "flore.harle" Date: Thu, 13 Nov 2025 14:28:16 +0100 Subject: [PATCH] Update gitlab-ci files --- .../linux-desktop-ubuntu-2204.yml | 20 +++++++++---------- .gitlab-ci-files/windows-desktop.yml | 2 +- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci-files/linux-desktop-ubuntu-2204.yml b/.gitlab-ci-files/linux-desktop-ubuntu-2204.yml index 7927739bb..ffddd1136 100644 --- a/.gitlab-ci-files/linux-desktop-ubuntu-2204.yml +++ b/.gitlab-ci-files/linux-desktop-ubuntu-2204.yml @@ -71,7 +71,6 @@ ubuntu2204-makefile-gcc-signed: ################################################# ubuntu2204-makefile-gcc-package: - stage: package tags: [ "docker-flat" ] image: gitlab.linphone.org:4567/bc/public/linphone-desktop/bc-dev-ubuntu-22-04-lts:$UBUNTU_2204_IMAGE_VERSION needs: [] @@ -91,21 +90,20 @@ ubuntu2204-makefile-gcc-package: ################################################# ubuntu2204-makefile-gcc-deploy: - stage: deploy - tags: [ "deploy-flat" ] - needs: - - ubuntu2204-makefile-gcc-package - only: + extends: .linux-deploy + needs: + - ubuntu2204-makefile-gcc-package + only: variables: - $NIGHTLY_MASTER - $DEPLOY_LINUX ubuntu2204-makefile-gcc-plugins-deploy: - stage: deploy - tags: [ "deploy-flat" ] - needs: - - ubuntu2204-makefile-gcc - only: + stage: deploy + tags: [ "deploy-flat" ] + needs: + - ubuntu2204-makefile-gcc + only: variables: - $DEPLOY_PLUGINS script: diff --git a/.gitlab-ci-files/windows-desktop.yml b/.gitlab-ci-files/windows-desktop.yml index 2821032eb..9f2e6efa9 100644 --- a/.gitlab-ci-files/windows-desktop.yml +++ b/.gitlab-ci-files/windows-desktop.yml @@ -177,7 +177,7 @@ win64-ninja-vs2022-scheduled-windows: .vs-win64-package: stage: package - needs: [] + dependencies: [] rules: - !reference [.rules-merge-request-manual, rules] - if: $NIGHTLY_MASTER