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
Guilhem Saurel
hpp-doc
Commits
13ff91e9
Commit
13ff91e9
authored
Nov 18, 2020
by
Guilhem Saurel
Browse files
misc: master → stable
parent
ba9b1ad5
Changes
6
Hide whitespace changes
Inline
Side-by-side
instructions/devel-sources.md
View file @
13ff91e9
...
...
@@ -111,8 +111,8 @@ To install all the packages on ubuntu 18.04 LTS 64 bit, you should do the follow
5.
Copy Config and Makefile
```bash
wget -O $DEVEL_HPP_DIR/config.sh https://raw.githubusercontent.com/humanoid-path-planner/hpp-doc/
master
/doc/config/ubuntu-18.04-melodic.sh
wget -O $DEVEL_HPP_DIR/src/Makefile https://raw.githubusercontent.com/humanoid-path-planner/hpp-doc/
master
/makefiles/devel.mk
wget -O $DEVEL_HPP_DIR/config.sh https://raw.githubusercontent.com/humanoid-path-planner/hpp-doc/
stable
/doc/config/ubuntu-18.04-melodic.sh
wget -O $DEVEL_HPP_DIR/src/Makefile https://raw.githubusercontent.com/humanoid-path-planner/hpp-doc/
stable
/makefiles/devel.mk
```
6.
cd into
`$DEVEL_HPP_DIR`
and type
...
...
instructions/stable-sources.md
View file @
13ff91e9
...
...
@@ -58,8 +58,8 @@ To install all the packages on ubuntu 18.04 LTS 64 bit, you should do the follow
5.
Copy Config and Makefile
```bash
wget -O $DEVEL_HPP_DIR/config.sh https://raw.githubusercontent.com/humanoid-path-planner/hpp-doc/
master
/doc/config/ubuntu-18.04-melodic.sh
wget -O $DEVEL_HPP_DIR/src/Makefile https://raw.githubusercontent.com/humanoid-path-planner/hpp-doc/
master
/makefiles/stable.mk
wget -O $DEVEL_HPP_DIR/config.sh https://raw.githubusercontent.com/humanoid-path-planner/hpp-doc/
stable
/doc/config/ubuntu-18.04-melodic.sh
wget -O $DEVEL_HPP_DIR/src/Makefile https://raw.githubusercontent.com/humanoid-path-planner/hpp-doc/
stable
/makefiles/stable.mk
```
6.
cd into
`$DEVEL_HPP_DIR`
and type
...
...
makefiles/devel.mk
View file @
13ff91e9
...
...
@@ -53,7 +53,7 @@ hpp-template-corba_repository=${HPP_REPO}
##################################
# {{{ Packages supporting HPP_VERSION
# Either a version tag (e.g. v4.3.0),
master
or devel
# Either a version tag (e.g. v4.3.0),
stable
or devel
HPP_VERSION
=
devel
HPP_EXTRA_FLAGS
=
-DBUILD_TESTING
=
${BUILD_TESTING}
$
...
...
makefiles/stable.mk
View file @
13ff91e9
...
...
@@ -53,7 +53,7 @@ hpp-template-corba_repository=${HPP_REPO}
##################################
# {{{ Packages supporting HPP_VERSION
# Either a version tag (e.g. v4.3.0),
master
or devel
# Either a version tag (e.g. v4.3.0),
stable
or devel
HPP_EXTRA_FLAGS
=
-DBUILD_TESTING
=
${BUILD_TESTING}
$
hpp-util_branch
=
v4.10.1
...
...
@@ -88,7 +88,7 @@ hpp-wholebody-step_branch=v4.10.1
hpp-wholebody-step_repository
=
${HPP_REPO}
hpp-wholebody-step_extra_flags
=
-DRUN_TESTS
=
OFF
hpp-doc_branch
=
master
hpp-doc_branch
=
stable
hpp-doc_repository
=
${HPP_REPO}
hpp-manipulation_branch
=
v4.10.1
...
...
scripts/README.md
View file @
13ff91e9
...
...
@@ -38,8 +38,8 @@ done
## Make new releases
The explanation below assumes you have an account on https://
gep
gitlab.laas.fr and that
you have write-access on https://
gep
gitlab.laas.fr/humanoid-path-planner/hpp-doc.
The explanation below assumes you have an account on https://gitlab.laas.fr and that
you have write-access on https://gitlab.laas.fr/humanoid-path-planner/hpp-doc.
### Naming the release
...
...
@@ -47,7 +47,7 @@ In the following, *M*, *m* and *r* correspond to major, minor and revision numbe
-
Tags
*vM.m.r-rc*
correspond to tested releases.
-
Tags
*vM.m.r*
correspond to benchmarked releases.
-
*
master
*
branches always point to the latest benchmarked release.
-
*
stable
*
branches always point to the latest benchmarked release.
-
*devel*
branches are always based on the latest tested release.
-
Major and minor numbers
*M*
and
*m*
increments are synchronized in all packages.
-
Revision number
*r*
increment is package-wise.
...
...
@@ -59,8 +59,8 @@ In the following, *M*, *m* and *r* correspond to major, minor and revision numbe
The procedure only checks that the code compiles and the unittests pass.
When you are ready with your changes:
1.
If hpp-doc has changes, push to branch
*devel*
on https://
gep
gitlab.laas.fr/humanoid-path-planner/hpp-doc
Otherwise, trigger a new build on https://
gep
gitlab.laas.fr/humanoid-path-planner/hpp-doc/pipelines
1.
If hpp-doc has changes, push to branch
*devel*
on https://gitlab.laas.fr/humanoid-path-planner/hpp-doc
Otherwise, trigger a new build on https://gitlab.laas.fr/humanoid-path-planner/hpp-doc/pipelines
2.
If the build is successful, run
`scripts/create-tags.sh <version>`
.
The script will check that:
-
You are on the
*devel*
branch in all hpp repositories.
...
...
@@ -74,4 +74,4 @@ Benchmarked release are tested release for which the benchmark have been run.
1.
Same as step 1 above, using branch
*future*
instead of
*devel*
.
2.
Run the scripts in
`hpp_benchmark`
.
3.
Same as step 2 above.
4.
Move the
*
master
*
branch to the current tag and push
*
master
*
and tag to github. (TODO add a script)
4.
Move the
*
stable
*
branch to the current tag and push
*
stable
*
and tag to github. (TODO add a script)
scripts/create-tags.sh
View file @
13ff91e9
...
...
@@ -21,7 +21,7 @@ hpp-constraints hpp-corbaserver hpp-core hpp_tutorial hpp-doc \
hpp-walkgen hpp-wholebody-step hpp-wholebody-step-corba
\
hpp-manipulation hpp-manipulation-corba hpp-manipulation-urdf
\
hpp-gepetto-viewer hpp-gui hpp-plot"
branch
=
"
master
"
branch
=
"
stable
"
remote
=
"origin"
c_what
=
"
\e
[33m"
...
...
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