From ff1483247b64029a1f81b1a756779362c6fc96f0 Mon Sep 17 00:00:00 2001 From: Yannick DAYER <yannick.dayer@idiap.ch> Date: Mon, 30 Oct 2023 16:55:25 +0100 Subject: [PATCH] Revert "meta(CI): switch to develop branch of each package" This reverts commits 4b8eeb8f366f5d5c987e2a0317a90ab56234c98d 7aadf38e09f0572451710a8573002299f378497a 4cc69f3fc278bda802addc6ecf0b04275f85bee8 866dfd28e4048e7f2f3f6c020eafaf426ec57bcb 1bb6db9646410ba5179989c51a41e5abe22cc0b3 --- .gitlab-ci.yml | 50 ++++++++++++++------------------------------------ 1 file changed, 14 insertions(+), 36 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c53c0e3..140f9c9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,22 +12,17 @@ stages: # - docs # core packages + bob/bob: stage: core trigger: - include: - - project: bob/bob - ref: develop - file: '.gitlab-ci.yml' + project: bob/bob strategy: depend bob/bob.io.base: stage: core trigger: - include: - - project: bob/bob.io.base - ref: develop - file: '.gitlab-ci.yml' + project: bob/bob.io.base strategy: depend needs: ['bob/bob'] @@ -37,10 +32,7 @@ bob/core: - PROJECT: ["bob/bob.measure", "bob/bob.learn.em", "bob/bob.pipelines"] stage: core trigger: - include: - - project: $PROJECT - ref: develop - file: '.gitlab-ci.yml' + project: $PROJECT strategy: depend needs: ['bob/bob.io.base'] @@ -48,10 +40,7 @@ bob/core: bob/bob.bio.base: stage: bio trigger: - include: - - project: bob/bob.bio.base - ref: develop - file: '.gitlab-ci.yml' + project: bob/bob.bio.base strategy: depend needs: ['bob/core'] @@ -61,20 +50,15 @@ bob/bob.bio: - PROJECT: ["bob/bob.bio.face", "bob/bob.bio.vein", "bob/bob.bio.spear"] stage: bio trigger: - include: - - project: $PROJECT - ref: develop - file: '.gitlab-ci.yml' + project: $PROJECT strategy: depend + needs: ['bob/bob.bio.base'] bob/bob.bio.video: stage: bio trigger: - include: - - project: bob/bob.bio.video - ref: develop - file: '.gitlab-ci.yml' + project: bob/bob.bio.video strategy: depend needs: ['bob/bob.bio'] @@ -82,31 +66,25 @@ bob/bob.bio.video: bob/bob.pad.base: stage: pad trigger: - include: - - project: bob/bob.pad.base - ref: develop - file: '.gitlab-ci.yml' + project: bob/bob.pad.base strategy: depend + needs: ['bob/bob.bio.base'] bob/bob.pad.face: stage: pad trigger: - include: - - project: bob/bob.pad.face - ref: develop - file: '.gitlab-ci.yml' + project: bob/bob.pad.face strategy: depend + needs: ['bob/bob.pad.base', 'bob/bob.bio.video'] bob/bob.fusion.base: stage: fusion trigger: - include: - - project: bob/bob.fusion.base - ref: develop - file: '.gitlab-ci.yml' + project: bob/bob.fusion.base strategy: depend + needs: ['bob/bob.bio.base', 'bob/bob.pad.base'] # docs -- GitLab