From 7c4b78eec42e40e2bbd81098c2bc4efac6b137a1 Mon Sep 17 00:00:00 2001 From: Mario Dominguez Date: Fri, 18 Oct 2024 08:24:12 +0200 Subject: [PATCH 1/3] Refs #21882: Update PR template Signed-off-by: Mario Dominguez --- .github/pull_request_template.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 034baf3d..37c4cad0 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. --> - + From a45437c73abb7e5c33d97cce0c52d3888c7c0fa3 Mon Sep 17 00:00:00 2001 From: Mario Dominguez Date: Fri, 18 Oct 2024 08:24:28 +0200 Subject: [PATCH 2/3] Refs #21882: Update GH workflows Signed-off-by: Mario Dominguez --- .github/workflows/mirror.yml | 2 +- .github/workflows/nightly-ubuntu-ci.yml | 14 ++++++++++++++ .github/workflows/nightly-windows-ci.yml | 12 ++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/.github/workflows/mirror.yml b/.github/workflows/mirror.yml index 982469a3..127eb57e 100644 --- a/.github/workflows/mirror.yml +++ b/.github/workflows/mirror.yml @@ -12,7 +12,7 @@ jobs: fail-fast: false matrix: dest_branch: - - '2.1.x' + - '2.2.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 70c27b2a..9de928f6 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.1.x - fastdds 3.1.x + nightly-ubuntu-ci-2_1_x: + uses: eProsima/Fast-DDS-Python/.github/workflows/reusable-ubuntu-ci.yml@2.1.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.1.x-3.1.x' + fastdds-python-branch: '2.1.x' + fastdds-branch: '3.1.x' + run-build: true + 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/reusable-ubuntu-ci.yml@2.0.x diff --git a/.github/workflows/nightly-windows-ci.yml b/.github/workflows/nightly-windows-ci.yml index cfb842fc..07d564cf 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.1.x - fastdds 3.1.x + nightly-windows-ci-2_1_x: + uses: eProsima/Fast-DDS-Python/.github/workflows/reusable-windows-ci.yml@2.1.x + with: + os-version: 'windows-2019' + vs-toolset: 'v142' + label: 'nightly-windows-v142-ci-2.1.x-3.1.x' + fastdds-python-branch: '2.1.x' + fastdds-branch: '3.1.x' + 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/reusable-windows-ci.yml@2.0.x From 61a4ac07384e2a62e70f67358a08b9907430708f Mon Sep 17 00:00:00 2001 From: Mario Dominguez Date: Fri, 18 Oct 2024 08:24:37 +0200 Subject: [PATCH 3/3] Refs #21882: Bump version Signed-off-by: Mario Dominguez --- fastdds_python/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastdds_python/CMakeLists.txt b/fastdds_python/CMakeLists.txt index 5e4a5383..736dedbe 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.1.0) +project(fastdds_python VERSION 2.2.0) # Set BUILD_TESTING to OFF by default. if(NOT BUILD_TESTING)