From 6d64d938460580d03cdbca226eabf4342e69c27a Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Tue, 7 Apr 2020 11:32:57 +0200 Subject: [PATCH] Remove empty dependencies when in first stage (CI) --- .../job-linux-desktop-archlinux-latest.yml | 6 ------ .gitlab-ci-files/job-linux-desktop-centos7.yml | 1 - .gitlab-ci-files/job-linux-desktop-debian10.yml | 10 +--------- .gitlab-ci-files/job-linux-desktop-debian8.yml | 2 -- .gitlab-ci-files/job-linux-desktop-debian9.yml | 7 ------- .gitlab-ci-files/job-linux-desktop-ubuntu-rolling.yml | 6 ------ .gitlab-ci-files/job-macosx-desktop.yml | 3 --- 7 files changed, 1 insertion(+), 34 deletions(-) diff --git a/.gitlab-ci-files/job-linux-desktop-archlinux-latest.yml b/.gitlab-ci-files/job-linux-desktop-archlinux-latest.yml index 3a51a1e9f..92dfb82c7 100644 --- a/.gitlab-ci-files/job-linux-desktop-archlinux-latest.yml +++ b/.gitlab-ci-files/job-linux-desktop-archlinux-latest.yml @@ -1,7 +1,6 @@ job-archlinux-latest-ninja-clang: tags: [ "docker-archlinux-latest" ] image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-archlinux:latest - dependencies: [] except: refs: - schedules @@ -18,7 +17,6 @@ job-archlinux-latest-ninja-clang: job-archlinux-latest-makefile-gcc: tags: [ "docker-archlinux-latest" ] image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-archlinux:latest - dependencies: [] only: variables: - $NIGHTLY_MASTER @@ -32,7 +30,6 @@ job-archlinux-latest-makefile-gcc: job-archlinux-latest-makefile-clang: tags: [ "docker-archlinux-latest" ] image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-archlinux:latest - dependencies: [] only: variables: - $NIGHTLY_MASTER @@ -46,7 +43,6 @@ job-archlinux-latest-makefile-clang: job-archlinux-latest-ninja-gcc: tags: [ "docker-archlinux-latest" ] image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-archlinux:latest - dependencies: [] only: variables: - $NIGHTLY_MASTER @@ -58,7 +54,6 @@ job-archlinux-latest-ninja-gcc: job-archlinux-latest-ninja-gcc-novideo: tags: [ "docker-archlinux-latest" ] - dependencies: [] only: variables: - $NIGHTLY_MASTER @@ -69,7 +64,6 @@ job-archlinux-latest-ninja-gcc-novideo: job-archlinux-latest-ninja-clang-novideo: tags: [ "docker-archlinux-latest" ] image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-archlinux:latest - dependencies: [] only: variables: - $NIGHTLY_MASTER diff --git a/.gitlab-ci-files/job-linux-desktop-centos7.yml b/.gitlab-ci-files/job-linux-desktop-centos7.yml index 218a36dc9..57c22bd57 100644 --- a/.gitlab-ci-files/job-linux-desktop-centos7.yml +++ b/.gitlab-ci-files/job-linux-desktop-centos7.yml @@ -32,7 +32,6 @@ job-centos7-ninja-gcc: tags: [ "docker" ] image: gitlab.linphone.org:4567/bc/public/linphone-desktop/bc-dev-centos7-qt-fuse-wget:5.12.5 - dependencies: [] except: refs: - schedules diff --git a/.gitlab-ci-files/job-linux-desktop-debian10.yml b/.gitlab-ci-files/job-linux-desktop-debian10.yml index 400a99fb5..edcfbb40b 100644 --- a/.gitlab-ci-files/job-linux-desktop-debian10.yml +++ b/.gitlab-ci-files/job-linux-desktop-debian10.yml @@ -2,7 +2,6 @@ job-debian10-ninja-gcc: tags: [ "docker-debian10" ] image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:10 - dependencies: [] except: refs: - schedules @@ -19,7 +18,6 @@ job-debian10-ninja-gcc: job-debian10-makefile-gcc: tags: [ "docker-debian10" ] image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:10 - dependencies: [] only: variables: - $NIGHTLY_MASTER @@ -34,7 +32,6 @@ job-debian10-makefile-gcc: job-debian10-ninja-gcc-novideo: tags: [ "docker-debian10" ] image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:10 - dependencies: [] only: variables: - $NIGHTLY_MASTER @@ -49,7 +46,6 @@ job-debian10-ninja-gcc-novideo: job-debian10-ninja-gcc-smallsdk: tags: [ "docker-debian10" ] image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:10 - dependencies: [] only: variables: - $NIGHTLY_MASTER @@ -63,7 +59,6 @@ job-debian10-ninja-gcc-smallsdk: job-debian10-ninja-clang: tags: [ "docker-debian10" ] - dependencies: [] only: variables: - $NIGHTLY_MASTER @@ -76,7 +71,6 @@ job-debian10-ninja-clang: job-debian10-ninja-clang-novideo: - dependencies: [] only: variables: - $NIGHTLY_MASTER @@ -87,7 +81,6 @@ job-debian10-ninja-clang-novideo: job-debian10-makefile-clang: tags: [ "docker-debian10" ] image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:10 - dependencies: [] only: variables: - $NIGHTLY_MASTER @@ -106,8 +99,7 @@ job-debian10-makefile-clang: job-debian10-makefile-clang-package: stage: package tags: [ "docker-debian10" ] - dependencies: - - job-debian10-makefile-clang + dependencies: [] only: variables: - $NIGHTLY_MASTER diff --git a/.gitlab-ci-files/job-linux-desktop-debian8.yml b/.gitlab-ci-files/job-linux-desktop-debian8.yml index 73da046aa..fe288bce2 100644 --- a/.gitlab-ci-files/job-linux-desktop-debian8.yml +++ b/.gitlab-ci-files/job-linux-desktop-debian8.yml @@ -5,7 +5,6 @@ job-debian8-makefile-gcc: tags: [ "docker-debian8" ] image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:8 - dependencies: [] except: refs: - schedules @@ -21,7 +20,6 @@ job-debian8-makefile-gcc: job-debian8-makefile-clang: tags: [ "docker-debian8" ] image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:8 - dependencies: [] only: variables: - $NIGHTLY_MASTER diff --git a/.gitlab-ci-files/job-linux-desktop-debian9.yml b/.gitlab-ci-files/job-linux-desktop-debian9.yml index 0f2fd7d03..be8cdd105 100644 --- a/.gitlab-ci-files/job-linux-desktop-debian9.yml +++ b/.gitlab-ci-files/job-linux-desktop-debian9.yml @@ -3,7 +3,6 @@ job-debian9-ninja-gcc: tags: [ "docker-debian9" ] image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:9 - dependencies: [] except: refs: - schedules @@ -15,7 +14,6 @@ job-debian9-ninja-gcc: job-debian9-ninja-gcc-smallsdk: - dependencies: [] except: refs: - schedules @@ -29,7 +27,6 @@ job-debian9-ninja-gcc-smallsdk: ################################################# job-debian9-makefile-gcc: - dependencies: [] tags: [ "docker-debian9" ] image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:9 only: @@ -43,7 +40,6 @@ job-debian9-makefile-gcc: extends: .job-linux-desktop job-debian9-ninja-gcc-novideo: - dependencies: [] only: variables: - $NIGHTLY_MASTER @@ -54,7 +50,6 @@ job-debian9-ninja-gcc-novideo: job-debian9-ninja-clang: tags: [ "docker-debian9" ] - dependencies: [] only: variables: - $NIGHTLY_MASTER @@ -67,7 +62,6 @@ job-debian9-ninja-clang: extends: .job-linux-desktop job-debian9-ninja-clang-novideo: - dependencies: [] only: variables: - $NIGHTLY_MASTER @@ -78,7 +72,6 @@ job-debian9-ninja-clang-novideo: job-debian9-makefile-clang: tags: [ "docker-debian9" ] image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:9 - dependencies: [] only: variables: - $NIGHTLY_MASTER diff --git a/.gitlab-ci-files/job-linux-desktop-ubuntu-rolling.yml b/.gitlab-ci-files/job-linux-desktop-ubuntu-rolling.yml index 776683e3c..b90039917 100644 --- a/.gitlab-ci-files/job-linux-desktop-ubuntu-rolling.yml +++ b/.gitlab-ci-files/job-linux-desktop-ubuntu-rolling.yml @@ -2,7 +2,6 @@ job-ubuntu-rolling-ninja-clang: tags: [ "docker-ubuntu-rolling" ] image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-ubuntu:rolling - dependencies: [] except: refs: - schedules @@ -22,7 +21,6 @@ job-ubuntu-rolling-ninja-clang: job-ubuntu-rolling-makefile-gcc: tags: [ "docker-ubuntu-rolling" ] image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-ubuntu:rolling - dependencies: [] only: variables: - $NIGHTLY_MASTER @@ -37,7 +35,6 @@ job-ubuntu-rolling-makefile-gcc: job-ubuntu-rolling-makefile-clang: tags: [ "docker-ubuntu-rolling" ] image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-ubuntu:rolling - dependencies: [] only: variables: - $NIGHTLY_MASTER @@ -52,7 +49,6 @@ job-ubuntu-rolling-makefile-clang: job-ubuntu-rolling-ninja-gcc: tags: [ "docker-ubuntu-rolling" ] image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-ubuntu:rolling - dependencies: [] only: variables: - $NIGHTLY_MASTER @@ -64,7 +60,6 @@ job-ubuntu-rolling-ninja-gcc: job-ubuntu-rolling-ninja-gcc-novideo: - dependencies: [] only: variables: - $NIGHTLY_MASTER @@ -74,7 +69,6 @@ job-ubuntu-rolling-ninja-gcc-novideo: job-ubuntu-rolling-ninja-clang-novideo: - dependencies: [] only: variables: - $NIGHTLY_MASTER diff --git a/.gitlab-ci-files/job-macosx-desktop.yml b/.gitlab-ci-files/job-macosx-desktop.yml index 457c16d1a..c8d265335 100644 --- a/.gitlab-ci-files/job-macosx-desktop.yml +++ b/.gitlab-ci-files/job-macosx-desktop.yml @@ -40,7 +40,6 @@ job-macosx-ninja: variables: CMAKE_GENERATOR: Ninja extends: .job-macosx-desktop - dependencies: [] ################################################# # Nightly @@ -54,7 +53,6 @@ job-macosx-makefile: CMAKE_GENERATOR: Unix Makefiles ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS extends: .job-macosx-desktop - dependencies: [] job-macosx-ninja-novideo: only: @@ -64,7 +62,6 @@ job-macosx-ninja-novideo: CMAKE_OPTIONS: -DENABLE_VIDEO=NO CMAKE_GENERATOR: Ninja extends: .job-macosx-desktop - dependencies: [] #job-macosx-xcode: # extends: .job-macosx-desktop