diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 3ea1ad7184..1e9056dea6 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -20,7 +20,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. --> - + diff --git a/.github/workflows/config/default_ci_2.13.x.repos b/.github/workflows/config/default_ci_2.13.x.repos new file mode 100644 index 0000000000..5541d131c2 --- /dev/null +++ b/.github/workflows/config/default_ci_2.13.x.repos @@ -0,0 +1,13 @@ +repositories: + fastcdr: + type: git + url: https://github.com/eProsima/Fast-CDR.git + version: 2.1.x + foonathan_memory_vendor: + type: git + url: https://github.com/eProsima/foonathan_memory_vendor.git + version: v1.3.1 + googletest-distribution: + type: git + url: https://github.com/google/googletest.git + version: release-1.11.0 diff --git a/.github/workflows/config/nightly_2.13.x.repos b/.github/workflows/config/nightly_2.13.x.repos new file mode 100644 index 0000000000..5541d131c2 --- /dev/null +++ b/.github/workflows/config/nightly_2.13.x.repos @@ -0,0 +1,13 @@ +repositories: + fastcdr: + type: git + url: https://github.com/eProsima/Fast-CDR.git + version: 2.1.x + foonathan_memory_vendor: + type: git + url: https://github.com/eProsima/foonathan_memory_vendor.git + version: v1.3.1 + googletest-distribution: + type: git + url: https://github.com/google/googletest.git + version: release-1.11.0 diff --git a/.github/workflows/mac-ci.yml b/.github/workflows/mac-ci.yml index 8f691df1ba..1a954d8087 100644 --- a/.github/workflows/mac-ci.yml +++ b/.github/workflows/mac-ci.yml @@ -27,6 +27,7 @@ on: push: branches: - 'master' + - '2.13.x' - '2.12.x' - '2.10.x' - '2.6.x' diff --git a/.github/workflows/mirror.yml b/.github/workflows/mirror.yml index c6de29ebc7..8490d89447 100644 --- a/.github/workflows/mirror.yml +++ b/.github/workflows/mirror.yml @@ -11,7 +11,7 @@ jobs: fail-fast: false matrix: dest_branch: - - '2.13.x' + - '2.14.x' steps: - name: Mirror action step id: mirror diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml index 3e7a2cca90..0c81af61fa 100644 --- a/.github/workflows/windows-ci.yml +++ b/.github/workflows/windows-ci.yml @@ -27,6 +27,7 @@ on: push: branches: - 'master' + - '2.13.x' - '2.12.x' - '2.10.x' - '2.6.x' diff --git a/CMakeLists.txt b/CMakeLists.txt index 5ccb97a1b2..fe4ada364e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,7 @@ endif() ############################################################################### # Project # ############################################################################### -project(fastrtps VERSION "2.13.3" LANGUAGES C CXX) +project(fastrtps VERSION "2.14.0" LANGUAGES C CXX) set(PROJECT_NAME_LARGE "Fast RTPS") string(TOUPPER "${PROJECT_NAME}" PROJECT_NAME_UPPER) diff --git a/package.xml b/package.xml index 6a00ddc567..07030056dd 100644 --- a/package.xml +++ b/package.xml @@ -2,7 +2,7 @@ fastrtps - 2.13.3 + 2.14.0 *eprosima Fast DDS* (formerly Fast RTPS) 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.