From daa5af4c8ea7f25d2c75d94250cf643988d435cc Mon Sep 17 00:00:00 2001
From: Benoit Mortier <benoit.mortier@fusiondirectory.org>
Date: Tue, 18 Apr 2023 21:18:02 +0200
Subject: [PATCH] :sparkles: feat(new-version) rewrote the new branch feature
page
Signed-off-by: Benoit Mortier <benoit.mortier@fusiondirectory.org>
---
source/index.rst | 1 +
source/new-version/index.rst | 12 ++++
.../new-fusiondirectory-integrator.rst | 26 +++++++
.../new-fusiondirectory-orchestrator.rst | 26 +++++++
.../new-version/new-fusiondirectory-tools.rst | 26 +++++++
source/new-version/new-fusiondirectory.rst | 39 ++++++++++
source/releasing/index.rst | 1 -
source/releasing/new-feature-branch.rst | 71 -------------------
8 files changed, 130 insertions(+), 72 deletions(-)
create mode 100644 source/new-version/index.rst
create mode 100644 source/new-version/new-fusiondirectory-integrator.rst
create mode 100644 source/new-version/new-fusiondirectory-orchestrator.rst
create mode 100644 source/new-version/new-fusiondirectory-tools.rst
create mode 100644 source/new-version/new-fusiondirectory.rst
delete mode 100644 source/releasing/new-feature-branch.rst
diff --git a/source/index.rst b/source/index.rst
index 81a93ff..66609f0 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 0000000..34b6181
--- /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 0000000..ffb2041
--- /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 0000000..46f19e8
--- /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 0000000..82b0a9d
--- /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 0000000..d97c51b
--- /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 fc34c7b..a276ac1 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 3f5e845..0000000
--- 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
--
GitLab