diff --git a/source/index.rst b/source/index.rst index 81a93ff1aae82a279f047ea39b203278fc06684e..66609f0b4bbb967d51a76a87af5b3568278eb701 100644 --- a/source/index.rst +++ b/source/index.rst @@ -20,6 +20,7 @@ Contents: development/index.rst marketplace/index.rst releasing/index.rst + new-version/index.rst support/index.rst security/index.rst contact/contact.rst diff --git a/source/new-version/index.rst b/source/new-version/index.rst new file mode 100644 index 0000000000000000000000000000000000000000..34b618152e3ec6504134e1289ff7088ee30ba551 --- /dev/null +++ b/source/new-version/index.rst @@ -0,0 +1,12 @@ +creating a new version our softwares +==================================== + +How to create a new version of our various softwares + +.. toctree:: + :maxdepth: 2 + + new-fusiondirectory.rst + new-fusiondirectory-integrator.rst + new-fusiondirectory-orchestrator.rst + new-fusiondirectory-tools.rst diff --git a/source/new-version/new-fusiondirectory-integrator.rst b/source/new-version/new-fusiondirectory-integrator.rst new file mode 100644 index 0000000000000000000000000000000000000000..ffb20411586d561265c95f6ff7b380530f666795 --- /dev/null +++ b/source/new-version/new-fusiondirectory-integrator.rst @@ -0,0 +1,26 @@ +Creating a new version of FusionDirectory Integrator +==================================================== + +- Create the new milestone +- Create the new branchs from master + +Create the new milestone +^^^^^^^^^^^^^^^^^^^^^^^^ + +- got to FusionDirectory `milestones`_ and create the new milestone, version is the version number + + - FusionDirectory Integrator version + - Start date, date of the milestone creation + - Stop date is start date + 3 month + +Create a new fixes branch from master +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +We need to create a branch + +The branch should be named with the version of the release followed by **-fixes**. + +ex: **1.3** is released the feature branch is **1.3-fixes** + + +.. _milestones : https://gitlab.fusiondirectory.org/groups/fusiondirectory/-/milestones diff --git a/source/new-version/new-fusiondirectory-orchestrator.rst b/source/new-version/new-fusiondirectory-orchestrator.rst new file mode 100644 index 0000000000000000000000000000000000000000..46f19e88272706a53de1b3c9972c15eac457921d --- /dev/null +++ b/source/new-version/new-fusiondirectory-orchestrator.rst @@ -0,0 +1,26 @@ +Creating a new version of FusionDirectory Orchestrator +====================================================== + +- Create the new milestone +- Create the new branchs from master + +Create the new milestone +^^^^^^^^^^^^^^^^^^^^^^^^ + +- got to FusionDirectory `milestones`_ and create the new milestone, version is the version number + + - FusionDirectory Orchestrator version + - Start date, date of the milestone creation + - Stop date is start date + 3 month + +Create a new fixes branch from master +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +We need to create a branch + +The branch should be named with the version of the release followed by **-fixes**. + +ex: **1.3** is released the feature branch is **1.3-fixes** + + +.. _milestones : https://gitlab.fusiondirectory.org/groups/fusiondirectory/-/milestones diff --git a/source/new-version/new-fusiondirectory-tools.rst b/source/new-version/new-fusiondirectory-tools.rst new file mode 100644 index 0000000000000000000000000000000000000000..82b0a9d84fd5a241299cd945f5bece66942a7f94 --- /dev/null +++ b/source/new-version/new-fusiondirectory-tools.rst @@ -0,0 +1,26 @@ +Creating a new version of FusionDirectory Tools +=============================================== + +- Create the new milestone +- Create the new branchs from master + +Create the new milestone +^^^^^^^^^^^^^^^^^^^^^^^^ + +- got to FusionDirectory `milestones`_ and create the new milestone, version is the version number + + - FusionDirectory Orchestrator version + - Start date, date of the milestone creation + - Stop date is start date + 3 month + +Create a new fixes branch from master +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +We need to create a branch + +The branch should be named with the version of the release followed by **-fixes**. + +ex: **1.3** is released the feature branch is **1.3-fixes** + + +.. _milestones : https://gitlab.fusiondirectory.org/groups/fusiondirectory/-/milestones diff --git a/source/new-version/new-fusiondirectory.rst b/source/new-version/new-fusiondirectory.rst new file mode 100644 index 0000000000000000000000000000000000000000..d97c51bea815808025e83ce49714355dea8b380f --- /dev/null +++ b/source/new-version/new-fusiondirectory.rst @@ -0,0 +1,39 @@ +Creating a new version of FusionDirectory +========================================= + +- Create the new milestone +- Create the new branchs from master +- Update include/variables_common.inc + +Create the new milestone +^^^^^^^^^^^^^^^^^^^^^^^^ + +- got to FusionDirectory `milestones`_ and create the new milestone + + - FusionDirectory version + - Start date, date of the milestone creation + - Stop date is start date + 3 month + +Create a new fixes branch from master +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +We need to create a branch for fusiondirectory and fusiondirectory-plugins + +The branch should be named with the version of the release followed by **-fixes**. + +ex: **1.3** is released the feature branch is **1.3-fixes** + +Increment FusionDirectory version +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Only if you create a new feature branch for FusionDirectory + +open include/variables_common.inc + +Change the version number in : + +.. code:: php + + define ("FD_VERSION", "1.3-fixes"); + +.. _milestones : https://gitlab.fusiondirectory.org/groups/fusiondirectory/-/milestones diff --git a/source/releasing/index.rst b/source/releasing/index.rst index fc34c7b1d8de2f8f8a19509ab6927ad19198e878..a276ac177c351d3b3d73b9c7d84a7b7523162279 100644 --- a/source/releasing/index.rst +++ b/source/releasing/index.rst @@ -10,4 +10,3 @@ How to create a release of our various softwares fusiondirectory-integrator.rst fusiondirectory-orchestrator.rst fusiondirectory-tools.rst - new-feature-branch.rst diff --git a/source/releasing/new-feature-branch.rst b/source/releasing/new-feature-branch.rst deleted file mode 100644 index 3f5e845af924e6f808da065d0512703bc0eddaa6..0000000000000000000000000000000000000000 --- a/source/releasing/new-feature-branch.rst +++ /dev/null @@ -1,71 +0,0 @@ -Create the new features branch for FusionDirectory -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -- Create the new milestone -- Create the new features branch from master -- Remove branch that we just merged -- Merge Changelog.md, AUTHORS.md, UPGRADE.md into fusiondirectory developement - version -- Merge Changelog.md into fusiondirectory-plugins -dev version -- Update include/variables_common.inc, only if you create a new feature branch for FusionDirectory - -Create the new milestone -^^^^^^^^^^^^^^^^^^^^^^^^ - -- got to FusionDirectory `milestones`_ and create the new milestone - -- For FusionDirectory - - - FusionDirectory 1.3.x - - Start date, date of the milestone creation - - Stop date is start date + 3 month - -Create a new fixes branch from master -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -The branch should be named with the version of the release followed by **-fixes**. - -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 -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -This operation have inside a ticket with the label ~release and with a -**MR** - -Changelog.md, AUTHORS.md, UPGRADE.md have to be merged into the developement branch -after a release to ensure that the merge from the -dev to master will be easy. - -* Create a new merge request from the developement branch - -* Push into the developpement branch the needed files - -.. code:: bash - - git checkout 1.2.1-fixes -- AUTHORS.md - -.. code:: bash - - git checkout 1.2.1-fixes -- Changelog.md - -.. code:: bash - - git checkout 1.2.1-fixes -- UPGRADE.md - -Increment FusionDirectory version -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -Only if you create a new feature branch for FusionDirectory - -open include/variables_common.inc - -Change the version number in : - -.. code:: php - - define ("FD_VERSION", "1.2-fixes"); - -.. _milestones : https://gitlab.fusiondirectory.org/groups/fusiondirectory/-/milestones