Branch out 2.1.0 (#113)

* Refs #22720. Update mirror workflow. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #22720. Bump version to 2.1.0. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #22720. Update PR template. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #22720. Update Release support table. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #22720. Add nightly for 2.0.x. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
eProsima · Jan 30, 2025 · 82980bc · 82980bc
1 parent e092959
commit 82980bc
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 3 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -21,7 +21,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 1.2.x -->
+<!-- @Mergifyio backport 2.0.x 1.2.x -->
 
 <!-- If an issue is already opened, please uncomment next line with the corresponding issue number. -->
 <!-- Fixes #(issue) -->

diff --git a/.github/workflows/mirror.yml b/.github/workflows/mirror.yml
@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         dest_branch:
-          - '2.0.x'
+          - '2.1.x'
           - '2.x'
     steps:
     - name: Mirror action step

diff --git a/.github/workflows/nightly-ubuntu-ci.yml b/.github/workflows/nightly-ubuntu-ci.yml
@@ -20,6 +20,20 @@ jobs:
       run-tests: true
       use-ccache: false
 
+  nightly-ubuntu-ci-2_0_x:
+    uses: eProsima/Discovery-Server/.github/workflows/reusable-ubuntu-ci.yml@2.0.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-22.04'
+      label: 'nightly-ubuntu-ci-2.0.x-3.1.x'
+      discovery-server-branch: '2.0.x'
+      fastdds-branch: '3.1.x'
+      ctest-args: "-LE xfail"
+      run-build: true
+      run-tests: true
+      use-ccache: false
+
   nightly-ubuntu-ci-v1_2_2:
     uses: eProsima/Discovery-Server/.github/workflows/reusable-ubuntu-ci.yml@1.2.x
     with:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -43,7 +43,7 @@ execute_process(COMMAND git describe --tags WORKING_DIRECTORY ${CMAKE_CURRENT_LI
 if (GIT_TAG_VERSION)
     string(REGEX MATCH "[0-9]+(\\.[0-9]+)*" PROJECT_VERSION ${GIT_TAG_VERSION} )
 else()
-    set(PROJECT_VERSION "2.0.0")
+    set(PROJECT_VERSION "2.1.0")
 endif()
 
 if (NOT PROJECT_VERSION)

diff --git a/RELEASE_SUPPORT.md b/RELEASE_SUPPORT.md
@@ -10,6 +10,8 @@ Please, refer to the [master branch](https://github.com/eProsima/Discovery-Serve
 
 |Fast DDS Version|Discovery Server Version|Discovery Server Latest Release|
 |----------------|------------------------|-------------------------------|
+|3.2|2.1.0|[v2.1.0](https://github.com/eProsima/Discovery-Server/releases/tag/v2.1.0)|
+|3.1|2.0.0|[v2.0.0](https://github.com/eProsima/Discovery-Server/releases/tag/v2.0.0)|
 |3.0|2.0.0|[v2.0.0](https://github.com/eProsima/Discovery-Server/releases/tag/v2.0.0)|
 |2.14|1.2.2|[v1.2.2](https://github.com/eProsima/Discovery-Server/releases/tag/v1.2.2)|
 |2.10|1.2.1|[v1.2.1](https://github.com/eProsima/Discovery-Server/releases/tag/v1.2.1)|
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,7 @@ jobs: @@
           fail-fast: false
           matrix:
             dest_branch:
-              - '2.0.x'
+              - '2.1.x'
               - '2.x'
         steps:
         - name: Mirror action step
@@ Expand Down @@