diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index ea4f7c3b..bfc48d6c 100644 --- 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. --> - + diff --git a/.github/workflows/mirror.yml b/.github/workflows/mirror.yml index 127eb57e..dc421783 100644 --- a/.github/workflows/mirror.yml +++ b/.github/workflows/mirror.yml @@ -12,7 +12,7 @@ jobs: fail-fast: false matrix: dest_branch: - - '2.2.x' + - '2.3.x' - '2.x' steps: - name: Mirror action step diff --git a/.github/workflows/nightly-ubuntu-ci.yml b/.github/workflows/nightly-ubuntu-ci.yml index a084514a..09a9eaef 100644 --- 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.2.x - fastdds 3.2.x + nightly-ubuntu-ci-2_2_x: + uses: eProsima/Fast-DDS-Python/.github/workflows/reusable-ubuntu-ci.yml@2.2.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.2.x-3.2.x' + fastdds-python-branch: '2.2.x' + fastdds-branch: '3.2.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/reusable-ubuntu-ci.yml@1.4.x diff --git a/.github/workflows/nightly-windows-ci.yml b/.github/workflows/nightly-windows-ci.yml index 877975ed..ccff6975 100644 --- 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.2.x - fastdds 3.2.x + nightly-windows-ci-2_2_x: + uses: eProsima/Fast-DDS-Python/.github/workflows/reusable-windows-ci.yml@2.2.x + with: + os-version: 'windows-2019' + vs-toolset: 'v142' + label: 'nightly-windows-v142-ci-2.2.x-3.2.x' + fastdds-python-branch: '2.2.x' + fastdds-branch: '3.2.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 index 736dedbe..1e80c783 100644 --- 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.2.0) +project(fastdds_python VERSION 2.3.0) # Set BUILD_TESTING to OFF by default. if(NOT BUILD_TESTING)