Branchout 3.6.x (#1239)

Signed-off-by: Emilio Cuesta <emiliocuesta@eprosima.com>

Author: emiliocuestaf

.github/pull_request_template.md

@@ -19,7 +19,7 @@
     In case of bug fixes, please provide the list of supported branches where this fix should be also merged.
     Please uncomment following line, adjusting the corresponding target branches for the backport.
 -->
-<!-- @Mergifyio backport 3.4.x 3.2.x 2.14.x -->
+<!-- @Mergifyio backport 3.5.x 3.4.x 3.2.x 2.14.x -->
 
 <!-- If an issue is already opened, please uncomment next line with the corresponding issue number. -->
 <!-- Fixes #(issue) -->

.github/workflows/mirror.yml

@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         dest_branch:
-          - '3.5.x'
+          - '3.6.x'
           - '3.x'
     steps:
     - name: Mirror action step

.github/workflows/nightly-ubuntu-ci.yml

@@ -20,6 +20,20 @@ jobs:
       run-tests: true
       use-ccache: false
 
+  nightly-ubuntu-ci-3_5_x:
+    uses: eProsima/Fast-DDS-docs/.github/workflows/reusable-ubuntu-ci.yml@3.5.x
+    with:
+      # It would be desirable to have a matrix of ubuntu OS for this job, but due to the issue opened in this ticket:
+      # https://github.com/orgs/community/discussions/128118 , it has been set as a single OS job.
+      os-version: 'ubuntu-24.04'
+      label: 'nightly-ubuntu-ci-3.5.x'
+      fastdds-docs-branch: '3.5.x'
+      fastdds-branch: '3.5.x'
+      fastdds-python-branch: '2.5.x'
+      run-build: true
+      run-tests: true
+      use-ccache: false
+
   nightly-ubuntu-ci-3_4_x:
     uses: eProsima/Fast-DDS-docs/.github/workflows/reusable-ubuntu-ci.yml@3.4.x
     with:

docs/conf.py

@@ -545,9 +545,9 @@ def configure_doxyfile(
 # built documents.
 #
 # The short X.Y version.
-version = "3.5.0"
+version = "3.6.0"
 # The full version, including alpha/beta/rc tags.
-release = "3.5.0"
+release = "3.6.0"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/notes/versions.rst

@@ -27,6 +27,12 @@ The following table shows the currently supported versions of Fast DDS and their
       - Release date
       - End of Standard Support date
       - EOL date
+    * - 3.6
+      - `3.6.x <https://github.com/eProsima/Fast-DDS/tree/3.6.x>`__
+      - Not yet released
+      - April 2026
+      - April 2027 (*)
+      - April 2027 (*)
     * - 3.5
       - `3.5.x <https://github.com/eProsima/Fast-DDS/tree/3.5.x>`__
       - `v3.5.0 <https://github.com/eProsima/Fast-DDS/releases/tag/v3.5.0>`__