Skip to content

Commit

Permalink
Bump version to 3.1.0 (#5285)
Browse files Browse the repository at this point in the history
* Refs #21784. Bump version to 3.1.0

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #21784. Update mirror workflow.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #21784. Update PR template.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #21784. Update nightly jobs.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
  • Loading branch information
MiguelCompany authored Oct 2, 2024
1 parent ed41ddb commit 3326fff
Show file tree
Hide file tree
Showing 9 changed files with 68 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,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 2.14.x 2.10.x -->
<!-- @Mergifyio backport 3.0.x 2.14.x 2.10.x -->

<!--
In case of critical bug fix, please uncomment following line, adjusting the corresponding LTS target branches for the backport.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mirror.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
fail-fast: false
matrix:
dest_branch:
- '3.0.x'
- '3.1.x'
- '3.x'
steps:
- name: Mirror action step
Expand Down
15 changes: 15 additions & 0 deletions .github/workflows/nightly-mac-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,21 @@ jobs:
fastdds-branch: 'master'
use-ccache: false

nightly-mac-ci-3_0_x:
strategy:
fail-fast: false
matrix:
security:
- 'ON'
- 'OFF'
uses: eProsima/Fast-DDS/.github/workflows/reusable-mac-ci.yml@3.0.x
with:
label: 'nightly-sec-${{ matrix.security }}-mac-ci-3.0.x'
cmake-args: "-DSECURITY=${{ matrix.security }}"
ctest-args: "-LE xfail"
fastdds-branch: '3.0.x'
use-ccache: false

nightly-mac-ci-2_14_x:
strategy:
fail-fast: false
Expand Down
14 changes: 14 additions & 0 deletions .github/workflows/nightly-sanitizers-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,20 @@ jobs:
fastdds_ref: 'master'
discovery_server_ref: 'master'

nightly-sanitizers-ci-3_0_x:
uses: eProsima/Fast-DDS/.github/workflows/reusable-sanitizers-ci.yml@3.0.x
with:
label: 'nightly-sec-sanitizers-ci-3.0.x'
run_asan_fastdds: true
run_asan_discovery_server: true
run_tsan_fastdds: true
colcon_build_args: ''
colcon_test_args: ''
cmake_args: ''
ctest_args: ''
fastdds_ref: '3.0.x'
discovery_server_ref: '2.0.x'

nightly-sanitizers-ci-2_14_x:
uses: eProsima/Fast-DDS/.github/workflows/reusable-sanitizers-ci.yml@2.14.x
with:
Expand Down
20 changes: 20 additions & 0 deletions .github/workflows/nightly-ubuntu-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,26 @@ jobs:
run-tests: true
use-ccache: false

nightly-ubuntu-ci-3_0_x:
strategy:
fail-fast: false
matrix:
os-image:
- 'ubuntu-22.04'
security:
- true
- false
uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@3.0.x
with:
os-image: ${{ matrix.os-image }}
label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-3.0.x'
ctest-args: "-LE xfail"
fastdds-branch: '3.0.x'
security: ${{ matrix.security }}
run-build: true
run-tests: true
use-ccache: false

nightly-ubuntu-ci-2_14_x:
strategy:
fail-fast: false
Expand Down
14 changes: 14 additions & 0 deletions .github/workflows/nightly-windows-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,20 @@ jobs:
ctest-args: "-LE xfail"
fastdds_branch: 'master'

nightly-windows-ci-3_0_x:
strategy:
fail-fast: false
matrix:
security:
- 'ON'
- 'OFF'
uses: eProsima/Fast-DDS/.github/workflows/reusable-windows-ci.yml@3.0.x
with:
label: 'nightly-sec-${{ matrix.security }}-windows-ci-3.0.x'
cmake-args: "-DSECURITY=${{ matrix.security }}"
ctest-args: "-LE xfail"
fastdds_branch: '3.0.x'

nightly-windows-ci-2_14_x:
strategy:
fail-fast: false
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ endif()
###############################################################################
# Project #
###############################################################################
project(fastdds VERSION "3.0.1" LANGUAGES C CXX)
project(fastdds VERSION "3.1.0" LANGUAGES C CXX)

set(PROJECT_NAME_LARGE "Fast DDS")
string(TOUPPER "${PROJECT_NAME}" PROJECT_NAME_UPPER)
Expand Down
2 changes: 1 addition & 1 deletion package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>fastdds</name>
<version>3.0.1</version>
<version>3.1.0</version>
<description>
*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.
</description>
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/rtps/messages/MessageReceiver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -867,7 +867,7 @@ bool MessageReceiver::proc_Submsg_Data(
uint32_t next_pos = msg->pos + payload_size;
if (msg->length >= next_pos && payload_size > 0)
{
FASTDDS_TODO_BEFORE(3, 1, "Pass keyFlag in serializedPayload, and always pass input data upwards");
FASTDDS_TODO_BEFORE(3, 2, "Pass keyFlag in serializedPayload, and always pass input data upwards");
if (dataFlag)
{
ch.serializedPayload.data = &msg->buffer[msg->pos];
Expand Down

0 comments on commit 3326fff

Please sign in to comment.