Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Humanoid Path Planner
hpp-doc
Commits
55e04bff
Commit
55e04bff
authored
Jun 07, 2021
by
Guilhem Saurel
Browse files
[CI] 16.04 → 20.04
parent
89aa25b6
Changes
5
Hide whitespace changes
Inline
Side-by-side
.dockers/ubuntu-18.04/Dockerfile
View file @
55e04bff
...
...
@@ -44,10 +44,13 @@ RUN apt-get update -qqy \
python-matplotlib
\
python-omniorb
\
qt4-dev-tools
\
qtbase5-dev
\
qttools5-dev
\
robotpkg-omniorb
\
robotpkg-qpoases+doc
\
robotpkg-roboptim-core
\
robotpkg-roboptim-trajectory
\
robotpkg-romeo-description
\
robotpkg-py36-omniorbpy
\
ros-
${
ROS
}
-octomap
\
ros-
${
ROS
}
-pr2-description
\
...
...
.dockers/ubuntu-
16
.04/Dockerfile
→
.dockers/ubuntu-
20
.04/Dockerfile
View file @
55e04bff
FROM
ubuntu:
16
.04
FROM
ubuntu:
20
.04
ENV
DEVEL_HPP_DIR=/workspace UBUNTU=
xeni
al ROS=
ki
netic
ENV
DEVEL_HPP_DIR=/workspace UBUNTU=
foc
al ROS=n
o
etic
RUN
apt-get update
-y
&&
apt-get
install
-y
\
curl
\
gnupg2
\
&&
rm
-rf
/var/lib/apt/lists/
*
ADD
repos.key /
...
...
@@ -16,49 +17,49 @@ RUN echo "deb http://packages.ros.org/ros/ubuntu ${UBUNTU} main" > /etc/apt/sour
RUN
apt-get update
-qqy
\
&&
DEBIAN_FRONTEND
=
noninteractive apt-get
install
-qqy
\
asciidoc
\
autoconf
\
bison
\
cmake
\
doxygen
\
flex
\
g++
\
git
\
graphviz
\
libassimp-dev
\
libboost-dev
\
libccd-dev
\
libcdd-dev
\
libeigen3-dev
\
libglpk-dev
\
lib
log4cxx10
-dev
\
lib
graphviz
-dev
\
libltdl-dev
\
libomniorb4-dev
\
libopenscenegraph-dev
\
libpcre3-dev
\
libqt
4-opengl
-dev
\
libqt
gui4
\
libqt
webkit
-dev
\
libqt
5svg5
-dev
\
libqt
5webkit5-dev
\
libqt
5xmlpatterns5
-dev
\
libtinyxml2-dev
\
liburdfdom-dev
\
libxml2-dev
\
omniidl
\
omniidl-python
\
libxml2
\
omniorb-nameserver
\
openscenegraph
\
oxygen-icon-theme
\
python-matplotlib
\
qt4-dev-tools
\
pyqt5-dev
\
python-is-python3
\
python3-pyqt5
\
python3-matplotlib
\
qtdeclarative5-dev
\
qtbase5-private-dev
\
qtmultimedia5-dev
\
robotpkg-omniorb
\
robotpkg-qpoases+doc
\
robotpkg-roboptim-core
\
robotpkg-roboptim-trajectory
\
ros-
${
ROS
}
-common-msgs
\
ros-
${
ROS
}
-kdl-parser
\
robotpkg-romeo-description
\
robotpkg-py38-omniorbpy
\
robotpkg-qt5-osgqt
\
ros-
${
ROS
}
-octomap
\
ros-
${
ROS
}
-pr2-description
\
ros-
${
ROS
}
-srdfdom
\
ros-
${
ROS
}
-resource-retriever
\
ros-
${
ROS
}
-tf
\
ros-
${
ROS
}
-tf-conversions
\
ros-
${
ROS
}
-srdfdom
\
ros-
${
ROS
}
-xacro
\
source-highlight
\
sudo
\
wget
\
&&
apt-get remove
-y
texlive-latex-base texlive-binaries ghostscript
\
...
...
.gitlab-ci.yml
View file @
55e04bff
...
...
@@ -79,8 +79,8 @@ stable-18.04-build:
-
stable
<<
:
*build_definition
stable-
16
.04-build
:
image
:
gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc:
16
.04
stable-
20
.04-build
:
image
:
gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc:
20
.04
allow_failure
:
true
only
:
-
stable
...
...
@@ -92,8 +92,8 @@ devel-18.04-build:
-
devel
<<
:
*build_definition
devel-
16
.04-build
:
image
:
gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc:
16
.04
devel-
20
.04-build
:
image
:
gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc:
20
.04
allow_failure
:
true
only
:
-
devel
...
...
@@ -107,11 +107,11 @@ stable-18.04-test:
-
stable
<<
:
*test_definition
stable-
16
.04-test
:
stable-
20
.04-test
:
allow_failure
:
true
image
:
gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc:
16
.04
image
:
gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc:
20
.04
dependencies
:
-
stable-
16
.04-build
-
stable-
20
.04-build
only
:
-
stable
<<
:
*test_definition
...
...
@@ -125,11 +125,11 @@ devel-18.04-test:
-
devel
<<
:
*test_definition
devel-
16
.04-test
:
image
:
gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc:
16
.04
devel-
20
.04-test
:
image
:
gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc:
20
.04
allow_failure
:
true
dependencies
:
-
devel-
16
.04-build
-
devel-
20
.04-build
only
:
-
devel
<<
:
*test_definition
...
...
@@ -142,11 +142,11 @@ stable-18.04-doc:
-
stable
<<
:
*doc_definition
stable-
16
.04-doc
:
image
:
gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc:
16
.04
stable-
20
.04-doc
:
image
:
gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc:
20
.04
allow_failure
:
true
dependencies
:
-
stable-
16
.04-build
-
stable-
20
.04-build
only
:
-
stable
<<
:
*doc_definition
...
...
@@ -159,11 +159,11 @@ devel-18.04-doc:
-
devel
<<
:
*doc_definition
devel-
16
.04-doc
:
image
:
gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc:
16
.04
devel-
20
.04-doc
:
image
:
gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc:
20
.04
allow_failure
:
true
dependencies
:
-
devel-
16
.04-build
-
devel-
20
.04-build
only
:
-
devel
<<
:
*doc_definition
scripts/README.md
View file @
55e04bff
...
...
@@ -26,7 +26,7 @@ You will find three files in the directory `${DEVEL_HPP_DIR}/tarball/`:
## Build docker images for CI
```
for ubuntu in
16
.04 18.04
for ubuntu in
20
.04 18.04
do
docker build -t gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc:$ubuntu -f .dockers/ubuntu-$ubuntu/Dockerfile ./scripts
docker push gitlab.laas.fr:4567/humanoid-path-planner/hpp-doc:$ubuntu
...
...
scripts/auto-install-hpp.sh
View file @
55e04bff
...
...
@@ -38,7 +38,7 @@ case $HOST_DIST in
robotpkg-qpoases+doc robotpkg-romeo-description robotpkg-py38-omniorbpy
\
ros-noetic-xacro libccd-dev ros-noetic-octomap
\
ros-noetic-resource-retriever ros-noetic-srdfdom
\
ros-noetic-pr2-description git libltdl-dev
python-omniorb
\
ros-noetic-pr2-description git libltdl-dev
\
python3-matplotlib qtbase5-private-dev qtdeclarative5-dev
qtmultimedia5-dev libqt5svg5-dev libxml2 libtinyxml2-dev
oxygen-icon-theme robotpkg-openscenegraph libpcre3-dev wget libcdd-dev"
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment