Skip to content

Commit 3326fff

Browse files
MiguelCompanyMiguelCompany
authored
Bump version to 3.1.0 (#5285)
* Refs #21784. Bump version to 3.1.0 Signed-off-by: Miguel Company <[email protected]> * Refs #21784. Update mirror workflow. Signed-off-by: Miguel Company <[email protected]> * Refs #21784. Update PR template. Signed-off-by: Miguel Company <[email protected]> * Refs #21784. Update nightly jobs. Signed-off-by: Miguel Company <[email protected]> --------- Signed-off-by: Miguel Company <[email protected]>
1 parent ed41ddb commit 3326fff

9 files changed

+68
-5
lines changed

‎.github/pull_request_template.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
In case of bug fixes, please provide the list of supported branches where this fix should be also merged.
2222
Please uncomment following line, adjusting the corresponding target branches for the backport.
2323
-->
24-
<!-- @Mergifyio backport 2.14.x 2.10.x -->
24+
<!-- @Mergifyio backport 3.0.x 2.14.x 2.10.x -->
2525

2626
<!--
2727
In case of critical bug fix, please uncomment following line, adjusting the corresponding LTS target branches for the backport.

‎.github/workflows/mirror.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
fail-fast: false
1414
matrix:
1515
dest_branch:
16-
- '3.0.x'
16+
- '3.1.x'
1717
- '3.x'
1818
steps:
1919
- name: Mirror action step

‎.github/workflows/nightly-mac-ci.yml

+15
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,21 @@ jobs:
2121
fastdds-branch: 'master'
2222
use-ccache: false
2323

24+
nightly-mac-ci-3_0_x:
25+
strategy:
26+
fail-fast: false
27+
matrix:
28+
security:
29+
- 'ON'
30+
- 'OFF'
31+
uses: eProsima/Fast-DDS/.github/workflows/[email protected]
32+
with:
33+
label: 'nightly-sec-${{ matrix.security }}-mac-ci-3.0.x'
34+
cmake-args: "-DSECURITY=${{ matrix.security }}"
35+
ctest-args: "-LE xfail"
36+
fastdds-branch: '3.0.x'
37+
use-ccache: false
38+
2439
nightly-mac-ci-2_14_x:
2540
strategy:
2641
fail-fast: false

‎.github/workflows/nightly-sanitizers-ci.yml

+14
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,20 @@ jobs:
2020
fastdds_ref: 'master'
2121
discovery_server_ref: 'master'
2222

23+
nightly-sanitizers-ci-3_0_x:
24+
uses: eProsima/Fast-DDS/.github/workflows/[email protected]
25+
with:
26+
label: 'nightly-sec-sanitizers-ci-3.0.x'
27+
run_asan_fastdds: true
28+
run_asan_discovery_server: true
29+
run_tsan_fastdds: true
30+
colcon_build_args: ''
31+
colcon_test_args: ''
32+
cmake_args: ''
33+
ctest_args: ''
34+
fastdds_ref: '3.0.x'
35+
discovery_server_ref: '2.0.x'
36+
2337
nightly-sanitizers-ci-2_14_x:
2438
uses: eProsima/Fast-DDS/.github/workflows/[email protected]
2539
with:

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

+20
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,26 @@ jobs:
2626
run-tests: true
2727
use-ccache: false
2828

29+
nightly-ubuntu-ci-3_0_x:
30+
strategy:
31+
fail-fast: false
32+
matrix:
33+
os-image:
34+
- 'ubuntu-22.04'
35+
security:
36+
- true
37+
- false
38+
uses: eProsima/Fast-DDS/.github/workflows/[email protected]
39+
with:
40+
os-image: ${{ matrix.os-image }}
41+
label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-3.0.x'
42+
ctest-args: "-LE xfail"
43+
fastdds-branch: '3.0.x'
44+
security: ${{ matrix.security }}
45+
run-build: true
46+
run-tests: true
47+
use-ccache: false
48+
2949
nightly-ubuntu-ci-2_14_x:
3050
strategy:
3151
fail-fast: false

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

+14
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,20 @@ jobs:
2020
ctest-args: "-LE xfail"
2121
fastdds_branch: 'master'
2222

23+
nightly-windows-ci-3_0_x:
24+
strategy:
25+
fail-fast: false
26+
matrix:
27+
security:
28+
- 'ON'
29+
- 'OFF'
30+
uses: eProsima/Fast-DDS/.github/workflows/[email protected]
31+
with:
32+
label: 'nightly-sec-${{ matrix.security }}-windows-ci-3.0.x'
33+
cmake-args: "-DSECURITY=${{ matrix.security }}"
34+
ctest-args: "-LE xfail"
35+
fastdds_branch: '3.0.x'
36+
2337
nightly-windows-ci-2_14_x:
2438
strategy:
2539
fail-fast: false

‎CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ endif()
2929
###############################################################################
3030
# Project #
3131
###############################################################################
32-
project(fastdds VERSION "3.0.1" LANGUAGES C CXX)
32+
project(fastdds VERSION "3.1.0" LANGUAGES C CXX)
3333

3434
set(PROJECT_NAME_LARGE "Fast DDS")
3535
string(TOUPPER "${PROJECT_NAME}" PROJECT_NAME_UPPER)

‎package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
44
<name>fastdds</name>
5-
<version>3.0.1</version>
5+
<version>3.1.0</version>
66
<description>
77
*eprosima Fast DDS* is a C++ implementation of the DDS (Data Distribution Service) standard of the OMG (Object Management Group). eProsima Fast DDS implements the RTPS (Real Time Publish Subscribe) protocol, which provides publisher-subscriber communications over unreliable transports such as UDP, as defined and maintained by the Object Management Group (OMG) consortium. RTPS is also the wire interoperability protocol defined for the Data Distribution Service (DDS) standard. *eProsima Fast DDS* expose an API to access directly the RTPS protocol, giving the user full access to the protocol internals.
88
</description>

‎src/cpp/rtps/messages/MessageReceiver.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -867,7 +867,7 @@ bool MessageReceiver::proc_Submsg_Data(
867867
uint32_t next_pos = msg->pos + payload_size;
868868
if (msg->length >= next_pos && payload_size > 0)
869869
{
870-
FASTDDS_TODO_BEFORE(3, 1, "Pass keyFlag in serializedPayload, and always pass input data upwards");
870+
FASTDDS_TODO_BEFORE(3, 2, "Pass keyFlag in serializedPayload, and always pass input data upwards");
871871
if (dataFlag)
872872
{
873873
ch.serializedPayload.data = &msg->buffer[msg->pos];

0 commit comments

Comments
 (0)