Bump version to 2.1.0 (#190)

* Refs #21783: Bump project version Signed-off-by: Mario Dominguez <[email protected]> * Refs #21783: Update workflows Signed-off-by: Mario Dominguez <[email protected]> * Refs #21783: Update PR template Signed-off-by: Mario Dominguez <[email protected]> * Refs #21783: Apply rev & minor nits Signed-off-by: Mario Dominguez <[email protected]> * Refs #21783: Remove v141 windows kit as it is not supported in Fast DDS 3.0.x Signed-off-by: Mario Dominguez <[email protected]> --------- Signed-off-by: Mario Dominguez <[email protected]>
eProsima · Oct 14, 2024 · 9a18286 · 9a18286
1 parent 0cac51f
commit 9a18286
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 3 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -17,7 +17,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.4.x 1.2.x 1.0.x -->
+<!-- @Mergifyio backport 2.0.x 1.4.x 1.2.x 1.0.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
@@ -12,7 +12,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
 
+  # python 2.0.x - fastdds 3.0.x
+  nightly-ubuntu-ci-2_0_x:
+    uses: eProsima/Fast-DDS-Python/.github/workflows/[email protected]
+    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.0.x'
+      fastdds-python-branch: '2.0.x'
+      fastdds-branch: '3.0.x'
+      run-build: true
+      run-tests: true
+      use-ccache: false
+
   # python 1.4.x - fastdds 2.14.x
   nightly-ubuntu-ci-1_4_x:
     uses: eProsima/Fast-DDS-Python/.github/workflows/[email protected]

diff --git a/.github/workflows/nightly-windows-ci.yml b/.github/workflows/nightly-windows-ci.yml
@@ -18,6 +18,18 @@ jobs:
       run-build: true
       run-tests: true
 
+  # python 2.0.x - fastdds 3.0.x
+  nightly-windows-ci-2_0_x:
+    uses: eProsima/Fast-DDS-Python/.github/workflows/[email protected]
+    with:
+      os-version: 'windows-2019'
+      vs-toolset: 'v142'
+      label: 'nightly-windows-v142-ci-2.0.x-3.0.x'
+      fastdds-python-branch: '2.0.x'
+      fastdds-branch: '3.0.x'
+      run-build: true
+      run-tests: true
+
   # python 1.4.x - fastdds 2.14.x
   nightly-windows-ci-1_4_x:
     strategy:

diff --git a/fastdds_python/CMakeLists.txt b/fastdds_python/CMakeLists.txt
@@ -24,7 +24,7 @@ if(POLICY CMP0086)
   cmake_policy(SET CMP0086 NEW)
 endif()
 
-project(fastdds_python VERSION 2.0.0)
+project(fastdds_python VERSION 2.1.0)
 
 # Set BUILD_TESTING to OFF by default.
 if(NOT BUILD_TESTING)
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,7 @@ jobs: @@
           fail-fast: false
           matrix:
             dest_branch:
-              - '2.0.x'
+              - '2.1.x'
               - '2.x'
         steps:
         - name: Mirror action step
@@ Expand Down @@