diff --git a/source/fusiondirectory/whatis/fusiondirectory.rst b/source/fusiondirectory/whatis/fusiondirectory.rst index e65ee2c4d416ec54d0d964dcb50e12fae9e471fc..dbc8145d461cf302f9329e0f48fbd7ab8d6fb527 100644 --- a/source/fusiondirectory/whatis/fusiondirectory.rst +++ b/source/fusiondirectory/whatis/fusiondirectory.rst @@ -74,10 +74,8 @@ This question can be solved by creating: - LDAP schema suitable for application to the LDAP server - A plugin for its management in FusionDirectory with the simple plugin `API`_ -- An `Argonaut`_ module for the client installed on the server .. _FAI : https://fai-project.org/ .. _OPSI : https://www.opsi.org/ .. _PARTAGE : https://partage.renater.fr/ -.. _Argonaut : https://www.argonaut-project.org/ .. _API : https://fusiondirectory-developer-documentation.readthedocs.io/en/1.4/api/index.html diff --git a/source/releasing/argonaut-source.rst b/source/releasing/argonaut-source.rst deleted file mode 100644 index d8dfb8a8e9db4692ec3f2f474ac1a78710dc4c60..0000000000000000000000000000000000000000 --- a/source/releasing/argonaut-source.rst +++ /dev/null @@ -1,87 +0,0 @@ -How to release a Argonaut Version -================================== - -- Update AUTHORS.md file -- Updates the Changelog.md -- Regenerate the manpages with the new version -- Merge the branch into master - -All those operations have to be made onto the 1.x-fixes branch each one -of them inside a ticket with the label ~release and with a **MR** - -Update the AUTHORS file -^^^^^^^^^^^^^^^^^^^^^^^ - -Add the authors of all the patchs we received to the AUTHORS file - -:: - - * Markus Amersdorfer <der.plusch@subnet.at> - Wiki setup, Testing, hints, proposals - -Updates the Changelog.md -^^^^^^^^^^^^^^^^^^^^^^^^ - -To update the Changelog.md you must first run the following command, at the end you have to put the milestone you want a changelog for - -.. code:: shell - - gitlab_changelog.py --config-file ~/.python-gitlab.cfg --gitlab fd --project "fusiondirectory/argonaut" "Argonaut 1.3.1" - -Update the user documentation -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -open an issue ins the `user manual issues`_ to update the release notes for -the supported version, label this issue ~release and with the correct -milestone - -The content should got into **source/argonaut/update/supported** - -the file should be named like in this example current version to new version - - -1.3-to-1.3.1.rst - -Update the UPGRADE documentation -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -Update UPGRADE.md with a new section for the new version corresponding -to what you have put into `user manual supported`_ after updating the documentation -for the release - -you can run for example - -.. code:: shell - - pandoc --from rst --to markdown -o 1.3-to-1.3.1.md 1.3-to-1.3.1.rst - -directly in the user-manual source to generate the content to copy/paste at the end of UPGRADE.MD - -Update manpages -^^^^^^^^^^^^^^^ - -Regenerate the manpages with the new version, use the -**update-manpages.sh** from the dev-tools - -.. code:: shell - - update-manpages.sh fusiondirectory 1.2.3 - -Merge the fixes branch into master -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -Only a gitlab master account user can do the merge on the master branch - -Tag the release -^^^^^^^^^^^^^^^ - -After merging the release we need to tag the release. go to `Argonaut tags`_ - -- Paste the Changelog.md corresponding to the release we just made -- Upload the fusiondirectory-xxx.tar.gz and - fusiondirectory-plugins-xxx.tar.gz to the tag - -.. _user manual issues: https://gitlab.fusiondirectory.org/fusiondirectory/user-manual/-/issues -.. _user manual supported : https://fusiondirectory-user-manual.readthedocs.io/en/latest/fusiondirectory/update/supported/index.html -.. _Argonaut tags : https://gitlab.fusiondirectory.org/fusiondirectory/argonaut/-/tags -.. _schema history : https://gitlab.fusiondirectory.org/fusiondirectory/schema-history/pipelines diff --git a/source/releasing/index.rst b/source/releasing/index.rst index a3d04bbd6b62d38cd465c1bca3b7394d717ac2b0..fc34c7b1d8de2f8f8a19509ab6927ad19198e878 100644 --- a/source/releasing/index.rst +++ b/source/releasing/index.rst @@ -10,5 +10,4 @@ How to create a release of our various softwares fusiondirectory-integrator.rst fusiondirectory-orchestrator.rst fusiondirectory-tools.rst - argonaut-source.rst new-feature-branch.rst diff --git a/source/releasing/new-feature-branch.rst b/source/releasing/new-feature-branch.rst index 1a4b7b2d4e1181fcc99ab216aa24b36f5847b2d6..3f5e845af924e6f808da065d0512703bc0eddaa6 100644 --- a/source/releasing/new-feature-branch.rst +++ b/source/releasing/new-feature-branch.rst @@ -1,5 +1,5 @@ -Create the new features branch for FusionDirectory and Argonaut -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Create the new features branch for FusionDirectory +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - Create the new milestone - Create the new features branch from master @@ -20,12 +20,6 @@ Create the new milestone - Start date, date of the milestone creation - Stop date is start date + 3 month -- For Argonaut - - - Argonaut 1.3.x - - Start date, date of the milestone creation - - Stop date is start date + 3 month - Create a new fixes branch from master ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -36,7 +30,6 @@ ex: **1.3** is released the feature branch is **1.3-fixes** Remove the branch we just merged ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - Merge Changelog.md, Authors.md, UPGRADE.md into into the developement branch ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -76,7 +69,3 @@ Change the version number in : define ("FD_VERSION", "1.2-fixes"); .. _milestones : https://gitlab.fusiondirectory.org/groups/fusiondirectory/-/milestones -.. _user manual issues: https://gitlab.fusiondirectory.org/fusiondirectory/user-manual/-/issues -.. _user manual supported : https://fusiondirectory-user-manual.readthedocs.io/en/latest/fusiondirectory/update/supported/index.html -.. _Argonaut tags : https://gitlab.fusiondirectory.org/fusiondirectory/argonaut/-/tags -.. _schema history : https://gitlab.fusiondirectory.org/fusiondirectory/schema-history/pipelines