Commit 19b42260 authored by Joseph Mirabel's avatar Joseph Mirabel Committed by Joseph Mirabel
Browse files

Merge remote-tracking branch 'origin/devel' into ubuntu-14.04

parents 9ac41973 aca3c7c6
docker login eur0c.laas.fr:4567
docker build -t eur0c.laas.fr:4567/humanoid-path-planner/hpp-doc/ubuntu:16.04 -f .dockers/ubuntu-14.04/Dockerfile .
docker build -t eur0c.laas.fr:4567/humanoid-path-planner/hpp-doc/ubuntu-14.04-premade:16.04 -f .dockers/ubuntu-14.04/Dockerfile.premade .
docker push eur0c.laas.fr:4567/humanoid-path-planner/hpp-doc/ubuntu-14.04-premade:16.04
......@@ -43,5 +43,3 @@ RUN apt-get update -qqy && apt-get install -qqy \
&& rm -rf /var/lib/apt/lists/*
COPY script/auto-install-hpp.sh /
ENTRYPOINT /auto-install-hpp.sh
FROM eur0c.laas.fr:4567/humanoid-path-planner/hpp-doc/ubuntu:14.04
RUN /auto-install-hpp.sh --branch master --target doxygen-1.8.10.install
RUN /auto-install-hpp.sh --branch master --target OpenSceneGraph-dae-plugin.install
RUN export DEVEL_DIR=/builds/humanoid-path-planner/hpp-doc/workspace; \
/auto-install-hpp.sh --branch ubuntu-14.04 --target doxygen-1.8.10.install
RUN export DEVEL_DIR=/builds/humanoid-path-planner/hpp-doc/workspace; \
/auto-install-hpp.sh --branch ubuntu-14.04 --target OpenSceneGraph-dae-plugin.install
RUN export DEVEL_DIR=/builds/humanoid-path-planner/hpp-doc/workspace; \
/auto-install-hpp.sh --branch ubuntu-14.04 --target qpOASES.install
RUN export DEVEL_DIR=/builds/humanoid-path-planner/hpp-doc/workspace; \
/auto-install-hpp.sh --branch ubuntu-14.04 --target eigen3.install
RUN export DEVEL_DIR=/builds/humanoid-path-planner/hpp-doc/workspace; \
/auto-install-hpp.sh --branch ubuntu-14.04 --target roboptim-trajectory-3.1.install
RUN export DEVEL_DIR=/builds/humanoid-path-planner/hpp-doc/workspace; \
mv $DEVEL_DIR /clean_workspace
......@@ -48,5 +48,3 @@ RUN apt-get install -qqy \
&& rm -rf /var/lib/apt/lists/*
COPY script/auto-install-hpp.sh /
ENTRYPOINT /auto-install-hpp.sh
FROM eur0c.laas.fr:4567/humanoid-path-planner/hpp-doc/ubuntu:16.04
RUN /auto-install-hpp.sh --branch master --target OpenSceneGraph-dae-plugin.install
RUN export DEVEL_DIR=/builds/humanoid-path-planner/hpp-doc/workspace; \
/auto-install-hpp.sh --branch devel --target OpenSceneGraph-dae-plugin.install
RUN export DEVEL_DIR=/builds/humanoid-path-planner/hpp-doc/workspace; \
/auto-install-hpp.sh --branch devel --target qpOASES.install
RUN export DEVEL_DIR=/builds/humanoid-path-planner/hpp-doc/workspace; \
/auto-install-hpp.sh --branch devel --target roboptim-trajectory-3.1.install
RUN export DEVEL_DIR=/builds/humanoid-path-planner/hpp-doc/workspace; \
mv $DEVEL_DIR /clean_workspace
......@@ -6,7 +6,9 @@ variables:
.build_template: &build_definition
stage: build
script: /auto-install-hpp.sh --branch ${CI_COMMIT_REF_NAME}
script:
- cp -r /clean_workspace $DEVEL_DIR
- /auto-install-hpp.sh --branch devel
artifacts:
paths:
- workspace
......@@ -32,28 +34,44 @@ variables:
paths:
- workspace
master-16-build:
master-build:
image: eur0c.laas.fr:4567/humanoid-path-planner/hpp-doc/master-premade:16.04
only:
- master
<<: *build_definition
devel-14-build:
image: eur0c.laas.fr:4567/humanoid-path-planner/hpp-doc/devel-premade:14.04
ubuntu-14.04-build:
image: eur0c.laas.fr:4567/humanoid-path-planner/hpp-doc/ubuntu-14.04-premade:14.04
only:
- devel
- ubuntu-14.04
<<: *build_definition
devel-16-build:
devel-build:
image: eur0c.laas.fr:4567/humanoid-path-planner/hpp-doc/devel-premade:16.04
only:
- devel
<<: *build_definition
devel-16-test:
master-test:
image: eur0c.laas.fr:4567/humanoid-path-planner/hpp-doc/master-premade:16.04
dependencies:
- master-build
only:
- master
<<: *test_definition
ubuntu-14.04-test:
image: eur0c.laas.fr:4567/humanoid-path-planner/hpp-doc/ubuntu-14.04-premade:14.04
dependencies:
- ubuntu-14.04-build
only:
- ubuntu-14.04
<<: *test_definition
devel-test:
image: eur0c.laas.fr:4567/humanoid-path-planner/hpp-doc/devel-premade:16.04
dependencies:
- devel-16-build
- devel-build
only:
- devel
<<: *test_definition
Supports Markdown
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