Skip to content

Commit aa31448

Browse files
Branchout 2.5.x (#277)
* Refs #23857. Bump version to 2.5.0 Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #23857. Update mirror workflow. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #23857. Update PR template. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #23857. Add nightlies for 2.4.x. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
1 parent 047a805 commit aa31448

5 files changed

Lines changed: 35 additions & 3 deletions

File tree

.github/pull_request_template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
In case of bug fixes, please provide the list of supported branches where this fix should be also merged.
1818
Please uncomment following line, adjusting the corresponding target branches for the backport.
1919
-->
20-
<!-- @Mergifyio backport 2.3.x 2.2.x 1.4.x -->
20+
<!-- @Mergifyio backport 2.4.x 2.3.x 2.2.x 1.4.x -->
2121

2222
<!-- If an issue is already opened, please uncomment next line with the corresponding issue number. -->
2323
<!-- Fixes #(issue) -->

.github/workflows/mirror.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
fail-fast: false
1313
matrix:
1414
dest_branch:
15-
- '2.4.x'
15+
- '2.5.x'
1616
- '2.x'
1717
steps:
1818
- name: Mirror action step

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,20 @@ jobs:
2020
run-tests: true
2121
use-ccache: false
2222

23+
# python 2.4.x - fastdds 3.4.x
24+
nightly-ubuntu-ci-2_4_x:
25+
uses: eProsima/Fast-DDS-Python/.github/workflows/reusable-ubuntu-ci.yml@2.4.x
26+
with:
27+
# It would be desirable to have a matrix of ubuntu OS for this job, but due to the issue opened in this ticket:
28+
# https://github.com/orgs/community/discussions/128118 , it has been set as a single OS job.
29+
os-version: 'ubuntu-22.04'
30+
label: 'nightly-ubuntu-ci-2.4.x-3.4.x'
31+
fastdds-python-branch: '2.4.x'
32+
fastdds-branch: '3.4.x'
33+
run-build: true
34+
run-tests: true
35+
use-ccache: false
36+
2337
# python 2.3.x - fastdds 3.3.x
2438
nightly-ubuntu-ci-2_3_x:
2539
uses: eProsima/Fast-DDS-Python/.github/workflows/reusable-ubuntu-ci.yml@2.3.x

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,24 @@ jobs:
2424
run-build: true
2525
run-tests: true
2626

27+
# python 2.4.x - fastdds 3.4.x
28+
nightly-windows-ci-2_4_x:
29+
strategy:
30+
fail-fast: false
31+
matrix:
32+
vs-toolset:
33+
- 'v142'
34+
- 'v143'
35+
uses: eProsima/Fast-DDS-Python/.github/workflows/reusable-windows-ci.yml@2.4.x
36+
with:
37+
os-version: 'windows-2022'
38+
vs-toolset: ${{ matrix.vs-toolset }}
39+
label: 'nightly-windows-${{ matrix.vs-toolset }}-ci-2.4.x-3.4.x'
40+
fastdds-python-branch: '2.4.x'
41+
fastdds-branch: '3.4.x'
42+
run-build: true
43+
run-tests: true
44+
2745
# python 2.3.x - fastdds 3.3.x
2846
nightly-windows-ci-2_3_x:
2947
strategy:

fastdds_python/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ if(POLICY CMP0086)
2424
cmake_policy(SET CMP0086 NEW)
2525
endif()
2626

27-
project(fastdds_python VERSION 2.4.1)
27+
project(fastdds_python VERSION 2.5.0)
2828

2929
if(NOT WIN32)
3030
# Default values for shared library suffix in MacOS

0 commit comments

Comments
 (0)