From 5ffe2cf63b493e63dcae190c3cef6cb5f9dc7c57 Mon Sep 17 00:00:00 2001 From: Chatewgne Date: Wed, 13 Nov 2024 11:22:09 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=93=9D=20[DOC]=20Update=20release=20and?= =?UTF-8?q?=20maintenance=20doc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/changelog.rst | 4 ++++ docs/contribute/contributing.rst | 10 +++++----- docs/install/maintenance.rst | 4 +--- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index 172326f082..b49866c94b 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -9,6 +9,10 @@ CHANGELOG - Fix missing Dockerfile path on make build scripts +**Documentation** + +- Update documentation for release and update obsolete example + 2.110.0 (2024-11-13) ---------------------------- diff --git a/docs/contribute/contributing.rst b/docs/contribute/contributing.rst index 47a37182bc..04a996d7b0 100644 --- a/docs/contribute/contributing.rst +++ b/docs/contribute/contributing.rst @@ -103,16 +103,16 @@ Release On master branch: -* Update files *VERSION*, *docs/conf.py* and *docs/changelog.rst* to remove ``+dev`` suffix and increment version (please use semver rules) +* Update files *VERSION* and *docs/changelog.rst* to remove ``+dev`` suffix and increment version (please use semver rules) * Run ``dch -r -D RELEASED``, update version in the same way and save -* Commit with message 'Release x.y.z' and push to ``master`` -* Create new release on Github, with tag X.Y.Z, click on "Generate release notes" +* Commit with message 'Release X.Y.Z' and push to ``master`` +* Create new release with name 'Geotrek-admin X.Y.Z' on Github, with tag X.Y.Z, click on "Generate release notes" * Wait for release to be published through CI -* Update files *VERSION*, *docs/conf.py* and *docs/changelog.rst* to add ``+dev`` suffix +* Update files *VERSION* and *docs/changelog.rst* to add ``+dev`` suffix * Run ``dch -v +dev --no-force-save-on-release`` and save * Commit with message 'Back to development' and push to ```master`` -* When creating a new release 'x.y.z' on github, Github actions will generate the .deb package file, and publish it on https://packages.geotrek.fr (see ``.github/workflows/test.yml`` file for details) +* When creating a new release 'X.Y.Z' on github, Github actions will generate the .deb package file, and publish it on https://packages.geotrek.fr (see ``.github/workflows/test.yml`` file for details) Other ways to contribute ------------------------- diff --git a/docs/install/maintenance.rst b/docs/install/maintenance.rst index 66c7a72fee..2b2322b465 100644 --- a/docs/install/maintenance.rst +++ b/docs/install/maintenance.rst @@ -34,11 +34,9 @@ Application restore If you restore Geotrek-admin on a new server, you will have to install PostgreSQL and PostGIS and create a database user first. Otherwise go directly to the database creation step. -Example for Ubuntu 18: - .. code-block:: bash - sudo apt install postgresql-10 postgresql-10-postgis-2.5 + sudo apt install postgresql-14 postgresql-14-postgis-3 sudo -u postgres psql -c "CREATE USER geotrek PASSWORD 'geotrek';"