Skip to content

[21882] Branch out 3.2.x #5336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 3.0.x 2.14.x 2.10.x -->
<!-- @Mergifyio backport 3.1.x 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.1.x'
- '3.2.x'
- '3.x'
steps:
- name: Mirror action step
Expand Down
22 changes: 22 additions & 0 deletions .github/workflows/nightly-mac-3.1.x.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Fast DDS MacOS CI (nightly 3.1.x)

on:
workflow_dispatch:
schedule:
- cron: '0 22 * * *' # At 22:00 GMT

jobs:
nightly-mac-ci-3_1_x:
strategy:
fail-fast: false
matrix:
security:
- 'ON'
- 'OFF'
uses: eProsima/Fast-DDS/.github/workflows/[email protected]
with:
label: 'nightly-sec-${{ matrix.security }}-mac-ci-3.1.x'
cmake-args: "-DSECURITY=${{ matrix.security }}"
ctest-args: "-LE xfail"
fastdds-branch: '3.1.x'
use-ccache: false
21 changes: 21 additions & 0 deletions .github/workflows/nightly-sanitizers-3.1.x.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Fast DDS Sanitizers CI (nightly 3.1.x)

on:
workflow_dispatch:
schedule:
- cron: '0 22 * * *' # At 22:00 GMT

jobs:
nightly-sanitizers-ci-3_1_x:
uses: eProsima/Fast-DDS/.github/workflows/[email protected]
with:
label: 'nightly-sec-sanitizers-ci-3.1.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.1.x'
discovery_server_ref: '2.0.x'
27 changes: 27 additions & 0 deletions .github/workflows/nightly-ubuntu-3.1.x.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Fast DDS Ubuntu CI (nightly 3.1.x)

on:
workflow_dispatch:
schedule:
- cron: '0 22 * * *' # At 22:00 GMT

jobs:
nightly-ubuntu-ci-3_1_x:
strategy:
fail-fast: false
matrix:
os-image:
- 'ubuntu-22.04'
security:
- true
- false
uses: eProsima/Fast-DDS/.github/workflows/[email protected]
with:
os-image: ${{ matrix.os-image }}
label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-3.1.x'
ctest-args: "-LE xfail"
fastdds-branch: '3.1.x'
security: ${{ matrix.security }}
run-build: true
run-tests: true
use-ccache: false
21 changes: 21 additions & 0 deletions .github/workflows/nightly-windows-3.1.x.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Fast DDS Windows CI (nightly 3.1.x)

on:
workflow_dispatch:
schedule:
- cron: '0 22 * * *' # At 22:00 GMT

jobs:
nightly-windows-ci-3_1_x:
strategy:
fail-fast: false
matrix:
security:
- 'ON'
- 'OFF'
uses: eProsima/Fast-DDS/.github/workflows/[email protected]
with:
label: 'nightly-sec-${{ matrix.security }}-windows-ci-3.1.x'
cmake-args: "-DSECURITY=${{ matrix.security }}"
ctest-args: "-LE xfail"
fastdds_branch: '3.1.x'
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.1.0" LANGUAGES C CXX)
project(fastdds VERSION "3.2.0" LANGUAGES C CXX)

set(PROJECT_NAME_LARGE "Fast DDS")
string(TOUPPER "${PROJECT_NAME}" PROJECT_NAME_UPPER)
Expand Down
4 changes: 2 additions & 2 deletions package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
<?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.1.0</version>
<version>3.2.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>
<maintainer email="[email protected]">Raul Sanchez Mateos</maintainer>
<maintainer email="[email protected]">Miguel Company</maintainer>
<maintainer email="[email protected]">Eduardo Ponz</maintainer>
<license file="LICENSE">Apache 2.0</license>

<url type="website">https://www.eprosima.com/</url>
Expand Down