Merge pull request GUDHI#872 from VincentRouvreau/update_new_gudhi_ve…

…rsion Update new gudhi version
DerbelHedi · Apr 17, 2023 · 1d87c16 · 1d87c16
2 parents 0b4ae5f + d25a9b5
commit 1d87c16
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/.github/for_maintainers/new_gudhi_version_creation.md b/.github/for_maintainers/new_gudhi_version_creation.md
@@ -25,7 +25,7 @@ nor [unlabelled closed PRs](https://github.com/GUDHI/gudhi-devel/pulls?q=is%3Apr
 **Edit the file CMakeGUDHIVersion.txt**, and increment major, minor, or patch version number, in function of the version new delivery.
 ```bash
 # cf. .gitignore - ignore this if it is a fresh clone version
-rm -rf data/points/COIL_database/lucky_cat.off_dist data/points/COIL_database/lucky_cat.off_sc.dot data/points/KleinBottle5D.off_dist data/points/KleinBottle5D.off_sc.dot data/points/human.off_dist data/points/human.off_sc.off data/points/human.off_sc.txt
+rm -rf data/points/COIL_database/lucky_cat.off_dist data/points/COIL_database/lucky_cat.off_sc.dot data/points/KleinBottle5D.off_dist data/points/KleinBottle5D.off_sc.dot data/points/human.off_dist data/points/human.off_sc.off data/points/human.off_sc.txt src/python/test/__pycache__
 ```
 
 Checkin the modifications, build and test the version:
@@ -55,7 +55,7 @@ mkdir gudhi.doc.@GUDHI_VERSION@
 cd gudhi.@GUDHI_VERSION@
 rm -rf build; mkdir build; cd build
 cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DWITH_GUDHI_EXAMPLE=ON -DPython_ADDITIONAL_VERSIONS=3 ..
-make doxygen  2>&1 | tee dox.log && grep warning dox.log
+make doxygen && grep warning doxygen.log
 ```
 
 ***[Check there are no error and the warnings]***
@@ -132,9 +132,16 @@ ARG GUDHI_VERSION="3.X.X"
 ...
 ```
 
-After pushing the changes the docker image build will be automatically performed for
+After pushing the changes in gudhi-deploy repo main branch, the docker image needs to be built and pushed at
 [latest_gudhi_version](https://hub.docker.com/repository/docker/gudhi/latest_gudhi_version)
-docker image on docker hub.
+docker image on docker hub:
+
+```bash
+docker build -t gudhi/latest_gudhi_version:3.X.X -f Dockerfile_for_gudhi_installation .
+docker tag gudhi/latest_gudhi_version:3.X.X gudhi/latest_gudhi_version:latest
+docker login
+docker push gudhi/latest_gudhi_version:3.X.X gudhi/latest_gudhi_version:latest
+```
 
 ***[Check there are no error]***
 

diff --git a/.github/how_to_compile_gudhi_in_a_conda_env.md b/.github/how_to_compile_gudhi_in_a_conda_env.md
@@ -68,8 +68,8 @@ mkdir build
 cd build
 # python OFF to prevent python modules search makes cmake faster
 cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DWITH_GUDHI_PYTHON=OFF  ..
-make doxygen 2>&1 | tee dox.log
-grep warning dox.log # Warnings can be lost with parallel doxygen
+make doxygen
+grep warning doxygen.log # Warnings can be lost with parallel doxygen
 firefox html/index.html # [optional] To display the c++ documentation. Anything else than firefox can be used.
 ```