diff --git a/source/development/workflow-tickets.rst b/source/development/workflow-tickets.rst index 669a83c1e16278e35b77cd2c9a1dd0d27fd68838..0c5f874a7b5da2bbf576d0eb726e822825d8df6c 100644 --- a/source/development/workflow-tickets.rst +++ b/source/development/workflow-tickets.rst @@ -60,8 +60,8 @@ if some more info is needed to act on the report - The **need info** label should be added, don’t hesitate to ping the user reporting the bug with **@(useranme)** to ask him to check it out -If the change need to be cherry-picked in a -fixes version -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +If the change need to be merged in a fixed version +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - The **fixes** label is added, when the cherry-pick as been merged we remove the **fixes** and add the **fixes-merged** label diff --git a/source/fusiondirectory/coding/sourcecode.rst b/source/fusiondirectory/coding/sourcecode.rst index e5121e08bd49da5a2a1d91a808ad75a582616bc8..b9591f9580136929c4fadafc861e1cb8af8d8676 100644 --- a/source/fusiondirectory/coding/sourcecode.rst +++ b/source/fusiondirectory/coding/sourcecode.rst @@ -18,12 +18,11 @@ Branches On the Git repository, you will find several existing branches: * `master` contains latest released official code, -* `xxx-fixes` contains the next minor release source code, -* `xxx-dev` contains the next major release source-code, +* `dev` contains the current code in development, -The `xxx-dev` branch is where new features are added. This code is reputed as **non stable**. +The `dev` branch is where new features are added. This code is reputed as **non stable**. -The `xxx-fixes` branches is where bugs are fixed. This code is reputed as *stable*. +The `master` branch is the released code. This code is reputed as *stable*. .. _fhs: diff --git a/source/fusiondirectory/release/index.rst b/source/fusiondirectory/release/index.rst index ab7bb7c8cf3c945c69705842a5079fac20982db3..ba0633fbd125b10d18a1b0c286f630a7dda28870 100644 --- a/source/fusiondirectory/release/index.rst +++ b/source/fusiondirectory/release/index.rst @@ -1,7 +1,7 @@ Release Policy ============== -This section explain the release cycle and where contributions, fixes will be merged +This section explain the release cycle and where contributions and new features will be merged .. toctree:: :maxdepth: 2 diff --git a/source/releasing/fusiondirectory-source.rst b/source/releasing/fusiondirectory-source.rst index c5772a1d7cd73971bb4b0fd6ae7071a5a9b1461b..ea6924f6ac4591483859afd67ae2af79057998c9 100644 --- a/source/releasing/fusiondirectory-source.rst +++ b/source/releasing/fusiondirectory-source.rst @@ -8,11 +8,10 @@ How to release a FusionDirectory Version fusiondirectory-plugins - Write the upgrade documentation - Update the UPGRADE.md -- Regenerate the manpages with the new version - Merge the branch into master for fusiondirectory and fusiondirectory plugins - -All those operations have to be made onto the 1.x-fixes branch each one + +All those operations have to be made onto a branch each one of them inside a ticket with the label ~release and with a **MR** Updates the locales @@ -84,20 +83,8 @@ you can run for example 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 - -this as to be done for fusiondirectory - -Merge the fixes branch into master -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Merge the branch into master +^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Only a gitlab master account user can do the merge on the master branch @@ -107,8 +94,6 @@ Tag the release After merging the release we need to tag the release. go to `FusionDirectory tags`_ and `FusionDirectory Plugin 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 Run the ci for the schema-history website ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -123,4 +108,4 @@ The CI is at `schema history`_ .. _user manual supported : https://fusiondirectory-user-manual.readthedocs.io/en/latest/fusiondirectory/update/supported/index.html .. _FusionDirectory tags : https://gitlab.fusiondirectory.org/fusiondirectory/fd/tags .. _FusionDirectory Plugin tags : https://gitlab.fusiondirectory.org/fusiondirectory/fd-plugins/tags -.. _schema history : https://gitlab.fusiondirectory.org/fusiondirectory/schema-history/pipelines +.. _schema history : https://gitlab.fusiondirectory.org/applications/schema-history