eProsima
diff --git a/‎.github/pull_request_template.md‎
Lines changed: 3 additions & 4 deletions b/‎.github/pull_request_template.md‎
Lines changed: 3 additions & 4 deletions
diff --git a/‎.github/workflows/config/asan_colcon.meta‎
Lines changed: 1 addition & 2 deletions b/‎.github/workflows/config/asan_colcon.meta‎
Lines changed: 1 addition & 2 deletions
diff --git a/‎.github/workflows/config/ci.meta‎
Lines changed: 2 additions & 3 deletions b/‎.github/workflows/config/ci.meta‎
Lines changed: 2 additions & 3 deletions
diff --git a/‎.github/workflows/config/documentation.meta‎
Lines changed: 1 addition & 1 deletion b/‎.github/workflows/config/documentation.meta‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎.github/workflows/config/tsan_colcon.meta‎
Lines changed: 1 addition & 2 deletions b/‎.github/workflows/config/tsan_colcon.meta‎
Lines changed: 1 addition & 2 deletions
diff --git a/‎.github/workflows/documentation-tests.yaml‎
Lines changed: 4 additions & 4 deletions b/‎.github/workflows/documentation-tests.yaml‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎.github/workflows/mac-ci.yml‎
Lines changed: 1 addition & 1 deletion b/‎.github/workflows/mac-ci.yml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎.github/workflows/mirror.yml‎
Lines changed: 24 additions & 2 deletions b/‎.github/workflows/mirror.yml‎
Lines changed: 24 additions & 2 deletions
diff --git a/‎.github/workflows/nightly-mac-ci.yml‎
Lines changed: 15 additions & 15 deletions b/‎.github/workflows/nightly-mac-ci.yml‎
Lines changed: 15 additions & 15 deletions
diff --git a/‎.github/workflows/nightly-sanitizers-ci.yml‎
Lines changed: 14 additions & 14 deletions b/‎.github/workflows/nightly-sanitizers-ci.yml‎
Lines changed: 14 additions & 14 deletions
@@ -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.13.x 2.10.x 2.6.x -->
+<!-- @Mergifyio backport 2.14.x 2.13.x 2.10.x 2.6.x -->
 
 <!-- If an issue is already opened, please uncomment next line with the corresponding issue number. -->
 <!-- Fixes #(issue) -->
@@ -32,8 +32,8 @@
 ## Contributor Checklist
 
 <!--
-    - If any of the elements of the following checklist is not applicable, substitute the checkbox [ ] by _N/A_
-    - If any of the elements of the following checklist is not fulfilled on purpose, please provide a reason and substitute the checkbox with ❌ or __NO__.
+    - If any of the elements of the following checklist is not applicable, substitute the checkbox [ ] by _N/A_:
+    - If any of the elements of the following checklist is not fulfilled on purpose, please provide a reason and substitute the checkbox [ ] with ❌: or __NO__:.
 -->
 
 - [ ] Commit messages follow the project guidelines. <!-- External contributors should sign the DCO. Fast DDS developers must also refer to the internal Redmine task. -->
@@ -48,7 +48,6 @@
     <!-- - Related documentation PR: eProsima/Fast-DDS-docs#(PR) -->
 - [ ] Applicable backports have been included in the description.
 
-
 ## Reviewer Checklist
 
 - [ ] The PR has a milestone assigned.
 
@@ -1,5 +1,5 @@
 names:
-    fastrtps:
+    fastdds:
         cmake-args:
             - "-DNO_TLS=OFF"
             - "-DSECURITY=ON"
@@ -14,4 +14,3 @@ names:
             - "-Dgtest_force_shared_crt=ON"
             - "-DBUILD_SHARED_LIBS=ON"
             - "-DBUILD_GMOCK=ON"
-
@@ -1,5 +1,5 @@
 names:
-    fastrtps:
+    fastdds:
         cmake-args:
             - "-DBUILD_DOCUMENTATION=OFF"
             - "-DBUILD_SHARED_LIBS=ON"
@@ -8,7 +8,6 @@ names:
             - "-DFASTDDS_ENFORCE_LOG_INFO=ON"
             - "-DFASTDDS_PIM_API_TESTS=ON"
             - "-DFASTDDS_STATISTICS=ON"
-            - "-DFASTRTPS_API_TESTS=OFF"
             - "-DINSTALL_EXAMPLES=ON"
             - "-DINSTALL_TOOLS=ON"
             - "-DINTERNAL_DEBUG=ON"
@@ -19,7 +18,7 @@ names:
             - "-DSTRICT_REALTIME=OFF"
             - "-DSYSTEM_TESTS=ON"
             - "-DMEMORYCHECK_COMMAND_OPTIONS=-q --tool=memcheck --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=2 --error-exitcode=1"
-            - "-DMEMORYCHECK_SUPPRESSIONS_FILE=../../src/fastrtps/valgrind.supp"
+            - "-DMEMORYCHECK_SUPPRESSIONS_FILE=../../src/fastdds/valgrind.supp"
     googletest-distribution:
         cmake-args:
             - "-Dgtest_force_shared_crt=ON"
 
@@ -1,5 +1,5 @@
 names:
-    fastrtps:
+    fastdds:
         cmake-args:
             - "-DBUILD_SHARED_LIBS=ON"
             - "-DSECURITY=ON"
 
@@ -3,12 +3,11 @@ names:
         cmake-args:
             - "-DCMAKE_C_FLAGS='-fsanitize=thread -O2 -g -fno-omit-frame-pointer'"
             - "-DCMAKE_CXX_FLAGS='-fsanitize=thread -O2 -g -fno-omit-frame-pointer'"
-    fastrtps:
+    fastdds:
         cmake-args:
             - "-DCOMPILE_EXAMPLES=OFF"
             - "-DEPROSIMA_BUILD_TESTS=ON"
             - "-DRTPS_API_TESTS=ON"
-            - "-DFASTRTPS_API_TESTS=OFF"
             - "-DFASTDDS_PIM_API_TESTS=ON"
             - "-DPERFORMANCE_TESTS=ON"
             - "-DNO_TLS=OFF"
 
@@ -44,7 +44,7 @@ jobs:
       - name: Sync eProsima/Fast-DDS repository
         uses: eProsima/eProsima-CI/external/checkout@v0
         with:
-          path: src/fastrtps
+          path: src/fastdds
           submodules: true
 
       - name: Get minimum supported version of CMake
@@ -74,14 +74,14 @@ jobs:
       - name: Download Fast DDS .repos
         uses: eProsima/eProsima-CI/ubuntu/vcs_import@v0
         with:
-          vcs_repos_file: ./src/fastrtps/fastrtps.repos
+          vcs_repos_file: ./src/fastdds/fastdds.repos
           destination_workspace: src
           skip_existing: 'true'
 
       - name: Fetch Fast DDS CI dependencies
         uses: eProsima/eProsima-CI/multiplatform/vcs_import@v0
         with:
-          vcs_repos_file: ${{ github.workspace }}/src/fastrtps/.github/workflows/config/ci.repos
+          vcs_repos_file: ${{ github.workspace }}/src/fastdds/.github/workflows/config/ci.repos
           destination_workspace: src
           skip_existing: 'true'
 
@@ -123,7 +123,7 @@ jobs:
         continue-on-error: false
         uses: eProsima/eProsima-CI/multiplatform/colcon_build@v0
         with:
-          colcon_meta_file: './src/fastrtps/.github/workflows/config/documentation.meta'
+          colcon_meta_file: './src/fastdds/.github/workflows/config/documentation.meta'
           colcon_build_args: ''
           colcon_build_args_default: ''
           cmake_args: ''
 
@@ -1,4 +1,4 @@
-name: Fast-DDS MacOS CI
+name: Fast DDS MacOS CI
 
 on:
   workflow_dispatch:
 
@@ -3,15 +3,19 @@ on:
   push:
     branches:
       - 'master'
+      - '2.14.x'
+
 jobs:
-  mirror_job:
+  mirror_job_master:
+    if: github.ref == 'refs/heads/master'
     runs-on: ubuntu-latest
     name: Mirror master branch to API & ABI compatible minor version branches
     strategy:
       fail-fast: false
       matrix:
         dest_branch:
-          - '2.14.x'
+          - '3.0.x'
+          - '3.x'
     steps:
     - name: Mirror action step
       id: mirror
@@ -20,3 +24,21 @@ jobs:
         github-token: ${{ secrets.GITHUB_TOKEN }}
         source: 'master'
         dest: ${{ matrix.dest_branch }}
+
+  mirror_job_2_x:
+      if: github.ref == 'refs/heads/2.14.x'
+      runs-on: ubuntu-latest
+      name: Mirror master branch to API & ABI compatible minor version branches
+      strategy:
+        fail-fast: false
+        matrix:
+          dest_branch:
+            - '2.x'
+      steps:
+      - name: Mirror action step
+        id: mirror
+        uses: eProsima/eProsima-CI/external/mirror-branch-action@v0
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          source: '2.14.x'
+          dest: ${{ matrix.dest_branch }}
@@ -1,4 +1,4 @@
-name: Fast-DDS MacOS CI (nightly)
+name: Fast DDS MacOS CI (nightly)
 
 on:
   workflow_dispatch:
@@ -20,6 +20,20 @@ jobs:
       ctest-args: "-LE xfail"
       fastdds-branch: 'master'
 
+  nightly-mac-ci-2_14_x:
+    strategy:
+      fail-fast: false
+      matrix:
+        security:
+          - 'ON'
+          - 'OFF'
+    uses: eProsima/Fast-DDS/.github/workflows/reusable-mac-ci.yml@2.14.x
+    with:
+      label: 'nightly-sec-${{ matrix.security }}-mac-ci-2.14.x'
+      cmake-args: "-DSECURITY=${{ matrix.security }}"
+      ctest-args: "-LE xfail"
+      fastdds-branch: '2.14.x'
+
   nightly-mac-ci-2_13_x:
     strategy:
       fail-fast: false
@@ -61,17 +75,3 @@ jobs:
       cmake-args: "-DSECURITY=${{ matrix.security }}"
       ctest-args: "-LE xfail"
       fastdds-branch: '2.6.x'
-
-  nightly-mac-ci-3_0_x-devel:
-    strategy:
-      fail-fast: false
-      matrix:
-        security:
-          - 'ON'
-          - 'OFF'
-    uses: eProsima/Fast-DDS/.github/workflows/reusable-mac-ci.yml@3.0.x-devel
-    with:
-      label: 'nightly-sec-${{ matrix.security }}-mac-ci-3.0.x-devel'
-      cmake-args: "-DSECURITY=${{ matrix.security }}"
-      ctest-args: "-LE xfail"
-      fastdds-branch: '3.0.x-devel'
@@ -20,6 +20,20 @@ jobs:
       fastdds_ref: 'master'
       discovery_server_ref: 'master'
 
+  nightly-sanitizers-ci-2_14_x:
+    uses: eProsima/Fast-DDS/.github/workflows/reusable-sanitizers-ci.yml@2.14.x
+    with:
+      label: 'nightly-sec-sanitizers-ci-2.14.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: '2.14.x'
+      discovery_server_ref: 'v1.2.2'
+
   nightly-sanitizers-ci-2_13_x:
       uses: eProsima/Fast-DDS/.github/workflows/reusable-sanitizers-ci.yml@2.13.x
       with:
@@ -61,17 +75,3 @@ jobs:
       ctest_args: ''
       fastdds_ref: '2.6.x'
       discovery_server_ref: 'v1.2.1'
-
-  nightly-sanitizers-ci-3_0_x-devel:
-    uses: eProsima/Fast-DDS/.github/workflows/reusable-sanitizers-ci.yml@3.0.x-devel
-    with:
-      label: 'nightly-sec-sanitizers-ci-3.0.x-devel'
-      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-devel'
-      discovery_server_ref: '3.0.x-devel'
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-name: Fast-DDS MacOS CI`
	`1`	`+name: Fast DDS MacOS CI`
`2`	`2`
`3`	`3`	`on:`
`4`	`4`	`workflow_dispatch:`