diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 04caba5f71c6810dbad45add3fa5814d74adaff1..9692181c0122d03c92cdf455f9844b2059de7480 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1 +1,80 @@ -include: 'https://gitlab.idiap.ch/bob/bob.devtools/raw/master/bob/devtools/data/gitlab-ci/nightlies.yaml' +stages: + - core + - extra + - final + +# what used to be core packages +bob/bob.extension: + stage: core + trigger: + project: bob/bob.extension + strategy: depend + +bob/core: + parallel: + matrix: + - PROJECT: ["bob/bob.io.base", "bob/bob.measure", "bob/bob.learn.em"] + stage: core + trigger: + project: $PROJECT + strategy: depend + + needs: ['bob/bob.extension'] + +# what used to be extra packages +bob/bob.pipelines: + stage: extra + trigger: + project: bob/bob.pipelines + strategy: depend + + needs: ['bob/core'] + +bob/bob.bio.base: + stage: extra + trigger: + project: bob/bob.bio.base + strategy: depend + + needs: ['bob/bob.pipelines'] + +bob/bob.bio: + parallel: + matrix: + - PROJECT: ["bob/bob.bio.face", "bob/bob.bio.video", "bob/bob.bio.vein", "bob/bob.bio.spear"] + stage: extra + trigger: + project: $PROJECT + + needs: ['bob/bob.bio.base'] + +bob/bob.pad.base: + stage: extra + trigger: + project: bob/bob.pad.base + strategy: depend + + needs: ['bob/bob.pipelines'] + +bob/bob.pad.face: + stage: extra + trigger: + project: bob/bob.pad.face + strategy: depend + + needs: ['bob/bob.pad.base'] + +bob/bob.fusion.base: + stage: extra + trigger: + project: bob/bob.fusion.base + strategy: depend + + needs: ['bob/bob.pipelines'] + +# test bob itself +bob/bob: + stage: final + trigger: + project: bob/bob + strategy: depend diff --git a/README.rst b/README.rst index 9fd11c344f6a073bcc063b146e1751203bbd7825..996b529e4a088699f5fed4dbbb39d74e848c8a79 100644 --- a/README.rst +++ b/README.rst @@ -23,7 +23,7 @@ Updating a Package If you don't know how to do this, ask for information on our `mailing list`_. -The new package must be added to ``order.txt`` respecting the order of +The new package must be added to ``.gitlab-ci.yml`` respecting the order of dependencies. Once the file is modified, commit the changes to a **new branch**, with a suggestive name. Push the branch and merge it to the master (or ask it to be merged), via a standard merge request. @@ -33,7 +33,7 @@ branch**, with a suggestive name. Push the branch and merge it to the master Removing a Package ------------------ -Once you remove a package from ``order.txt``, make sure to remove it from ``bob/bob`` +Once you remove a package from ``.gitlab-ci.yml``, make sure to remove it from ``bob/bob`` and ``bob/docs`` repositories as well. diff --git a/order.txt b/order.txt deleted file mode 100644 index dfddac3a721f1fa65459cdde034d8a991200d670..0000000000000000000000000000000000000000 --- a/order.txt +++ /dev/null @@ -1,21 +0,0 @@ -# what used to be core packages -bob/bob.extension -bob/bob.io.base -bob/bob.measure -bob/bob.learn.em - -# what used to be extra packages -bob/bob.pipelines -bob/bob.bio.base -bob/bob.bio.face -bob/bob.bio.video -bob/bob.bio.vein -bob/bob.bio.spear - -bob/bob.pad.base -bob/bob.pad.face - -bob/bob.fusion.base - -# test bob itself -bob/bob