Commit d4cfe781 authored by Guilhem Saurel's avatar Guilhem Saurel
Browse files

[CI] run master CI on master branch

parent 452b6bb9
...@@ -76,14 +76,14 @@ variables: ...@@ -76,14 +76,14 @@ variables:
master-18.04-build: master-18.04-build:
image: gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/master-premade:18.04 image: gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/master-premade:18.04
only: only:
- future - master
<<: *build_definition <<: *build_definition
master-16.04-build: master-16.04-build:
image: gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/master-premade:16.04 image: gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc/master-premade:16.04
allow_failure: true allow_failure: true
only: only:
- future - master
<<: *build_definition <<: *build_definition
devel-18.04-build: devel-18.04-build:
...@@ -104,7 +104,7 @@ master-18.04-test: ...@@ -104,7 +104,7 @@ master-18.04-test:
dependencies: dependencies:
- master-18.04-build - master-18.04-build
only: only:
- future - master
<<: *test_definition <<: *test_definition
master-16.04-test: master-16.04-test:
...@@ -113,7 +113,7 @@ master-16.04-test: ...@@ -113,7 +113,7 @@ master-16.04-test:
dependencies: dependencies:
- master-16.04-build - master-16.04-build
only: only:
- future - master
<<: *test_definition <<: *test_definition
...@@ -139,7 +139,7 @@ master-18.04-doc: ...@@ -139,7 +139,7 @@ master-18.04-doc:
dependencies: dependencies:
- master-18.04-build - master-18.04-build
only: only:
- future - master
<<: *doc_definition <<: *doc_definition
master-16.04-doc: master-16.04-doc:
...@@ -148,7 +148,7 @@ master-16.04-doc: ...@@ -148,7 +148,7 @@ master-16.04-doc:
dependencies: dependencies:
- master-16.04-build - master-16.04-build
only: only:
- future - master
<<: *doc_definition <<: *doc_definition
devel-18.04-doc: devel-18.04-doc:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment