Prepare 3.0.x-devel to become master (#4723)

* Refs #20893: Upgrade mirror job Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #20893: Update readme warning Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #20893: Remove 3.0.x rebase workflow Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #20893: Prepare CI for master switch Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #20893: Update PR template Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #20893: Apply Eliana's suggestions Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #20893: Apply Eliana's suggestions Signed-off-by: eduponz <eduardoponz@eprosima.com> --------- Signed-off-by: eduponz <eduardoponz@eprosima.com>
eProsima · May 8, 2024 · f654ca9 · f654ca9
1 parent 8934b35
commit f654ca9
Show file tree

Hide file tree

Showing 15 changed files with 97 additions and 123 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -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.

diff --git a/.github/workflows/documentation-tests.yaml b/.github/workflows/documentation-tests.yaml
@@ -90,7 +90,7 @@ jobs:
         uses: eProsima/eProsima-CI/ubuntu/get_related_branch_from_repo@v0
         with:
           remote_repository: eProsima/Fast-DDS-python
-          fallback_branch: ${{ inputs.fastdds_python_branch || '3.0.x-devel' }}
+          fallback_branch: ${{ inputs.fastdds_python_branch || 'main' }}
 
       - name: Download Fast DDS Python repo
         uses: eProsima/eProsima-CI/external/checkout@v0
@@ -104,7 +104,7 @@ jobs:
         uses: eProsima/eProsima-CI/ubuntu/get_related_branch_from_repo@v0
         with:
           remote_repository: eProsima/Fast-DDS-docs
-          fallback_branch: ${{ inputs.fastdds_docs_branch || '3.0.x-devel' }}
+          fallback_branch: ${{ inputs.fastdds_docs_branch || 'master' }}
 
       - name: Download Fast DDS documentation repo
         uses: eProsima/eProsima-CI/external/checkout@v0

diff --git a/.github/workflows/mac-ci.yml b/.github/workflows/mac-ci.yml
@@ -48,4 +48,4 @@ jobs:
       colcon-args: ${{ inputs.colcon-args }}
       cmake-args: '-DSECURITY=ON ${{ inputs.cmake-args }}'
       ctest-args: ${{ inputs.ctest-args }}
-      fastdds-branch: ${{ inputs.fastdds_branch || github.ref || '3.0.x-devel' }}
+      fastdds-branch: ${{ inputs.fastdds_branch || github.ref || 'master' }}
diff --git a/.github/workflows/mirror.yml b/.github/workflows/mirror.yml
@@ -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:
           - '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 }}
diff --git a/.github/workflows/nightly-mac-ci.yml b/.github/workflows/nightly-mac-ci.yml
@@ -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'
diff --git a/.github/workflows/nightly-sanitizers-ci.yml b/.github/workflows/nightly-sanitizers-ci.yml
@@ -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'
diff --git a/.github/workflows/nightly-ubuntu-ci.yml b/.github/workflows/nightly-ubuntu-ci.yml
@@ -23,7 +23,7 @@ jobs:
       ctest-args: "-LE xfail"
       fastdds-branch: 'master'
 
-  nightly-ubuntu-ci-2_13_x:
+  nightly-ubuntu-ci-2_14_x:
     strategy:
       fail-fast: false
       matrix:
@@ -32,15 +32,15 @@ jobs:
         security:
           - 'ON'
           - 'OFF'
-    uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@2.13.x
+    uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@2.14.x
     with:
       os-image: ${{ matrix.os-image }}
-      label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-2.13.x'
+      label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-2.14.x'
       cmake-args: "-DSECURITY=${{ matrix.security }}"
       ctest-args: "-LE xfail"
-      fastdds-branch: '2.13.x'
+      fastdds-branch: '2.14.x'
 
-  nightly-ubuntu-ci-2_10_x:
+  nightly-ubuntu-ci-2_13_x:
     strategy:
       fail-fast: false
       matrix:
@@ -49,15 +49,15 @@ jobs:
         security:
           - 'ON'
           - 'OFF'
-    uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@2.10.x
+    uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@2.13.x
     with:
       os-image: ${{ matrix.os-image }}
-      label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-2.10.x'
+      label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-2.13.x'
       cmake-args: "-DSECURITY=${{ matrix.security }}"
       ctest-args: "-LE xfail"
-      fastdds-branch: '2.10.x'
+      fastdds-branch: '2.13.x'
 
-  nightly-ubuntu-ci-2_6_x:
+  nightly-ubuntu-ci-2_10_x:
     strategy:
       fail-fast: false
       matrix:
@@ -66,15 +66,15 @@ jobs:
         security:
           - 'ON'
           - 'OFF'
-    uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@2.6.x
+    uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@2.10.x
     with:
       os-image: ${{ matrix.os-image }}
-      label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-2.6.x'
+      label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-2.10.x'
       cmake-args: "-DSECURITY=${{ matrix.security }}"
       ctest-args: "-LE xfail"
-      fastdds-branch: '2.6.x'
+      fastdds-branch: '2.10.x'
 
-  nightly-ubuntu-ci-3_0_x-devel:
+  nightly-ubuntu-ci-2_6_x:
     strategy:
       fail-fast: false
       matrix:
@@ -83,10 +83,10 @@ jobs:
         security:
           - 'ON'
           - 'OFF'
-    uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@3.0.x-devel
+    uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@2.6.x
     with:
       os-image: ${{ matrix.os-image }}
-      label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-3.0.x-devel'
+      label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-2.6.x'
       cmake-args: "-DSECURITY=${{ matrix.security }}"
       ctest-args: "-LE xfail"
-      fastdds-branch: '3.0.x-devel'
+      fastdds-branch: '2.6.x'
diff --git a/.github/workflows/nightly-windows-ci.yml b/.github/workflows/nightly-windows-ci.yml
@@ -20,6 +20,20 @@ jobs:
       ctest-args: "-LE xfail"
       fastdds_branch: 'master'
 
+  nightly-windows-ci-2_14_x:
+      strategy:
+        fail-fast: false
+        matrix:
+          security:
+            - 'ON'
+            - 'OFF'
+      uses: eProsima/Fast-DDS/.github/workflows/reusable-windows-ci.yml@2.14.x
+      with:
+        label: 'nightly-sec-${{ matrix.security }}-windows-ci-2.14.x'
+        cmake-args: "-DSECURITY=${{ matrix.security }}"
+        ctest-args: "-LE xfail"
+        fastdds_branch: '2.14.x'
+
   nightly-windows-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-windows-ci-3_0_x-devel:
-    strategy:
-      fail-fast: false
-      matrix:
-        security:
-          - 'ON'
-          - 'OFF'
-    uses: eProsima/Fast-DDS/.github/workflows/reusable-windows-ci.yml@3.0.x-devel
-    with:
-      label: 'nightly-sec-${{ matrix.security }}-windows-ci-3.0.x-devel'
-      cmake-args: "-DSECURITY=${{ matrix.security }}"
-      ctest-args: "-LE xfail"
-      fastdds_branch: '3.0.x-devel'
diff --git a/.github/workflows/rebase-3.0.x-devel.yaml b/.github/workflows/rebase-3.0.x-devel.yaml
diff --git a/.github/workflows/reusable-sanitizers-ci.yml b/.github/workflows/reusable-sanitizers-ci.yml
@@ -175,7 +175,7 @@ jobs:
           colcon_meta_file: ${{ github.workspace }}/src/fastdds/.github/workflows/config/asan_colcon.meta
           colcon_build_args: ${{ inputs.colcon_build_args }}
           cmake_args: ${{ inputs.cmake_args }}
-          cmake_args_default: -DEPROSIMA_BUILD_TESTS=ON -DRTPS_API_TESTS=ON -Dfastdds_API_TESTS=ON -DFASTDDS_PIM_API_TESTS=ON -DPERFORMANCE_TESTS=ON
+          cmake_args_default: -DEPROSIMA_BUILD_TESTS=ON -DRTPS_API_TESTS=ON -DFASTDDS_PIM_API_TESTS=ON -DPERFORMANCE_TESTS=ON
           cmake_build_type: 'Debug'
           workspace: ${{ github.workspace }}
           workspace_dependencies: ''

diff --git a/.github/workflows/reusable-ubuntu-ci.yml b/.github/workflows/reusable-ubuntu-ci.yml
@@ -104,7 +104,7 @@ jobs:
         uses: eProsima/eProsima-CI/ubuntu/get_related_branch_from_repo@v0
         with:
           remote_repository: eProsima/ShapesDemo
-          fallback_branch: ${{ inputs.fastdds-branch || '3.0.x-devel' }}
+          fallback_branch: ${{ inputs.fastdds-branch || 'master' }}
 
       - name: Download Shapes Demo repo
         uses: eProsima/eProsima-CI/external/checkout@v0

diff --git a/.github/workflows/sanitizers-ci.yml b/.github/workflows/sanitizers-ci.yml
@@ -73,5 +73,5 @@ jobs:
       colcon_test_args: ${{ inputs.colcon_test_args || '' }}
       cmake_args: ${{ inputs.cmake_args || '' }}
       ctest_args: ${{ inputs.ctest_args || '' }}
-      fastdds_ref: ${{ inputs.fastdds_ref || github.ref || '3.0.x-devel' }}
-      discovery_server_ref: ${{ inputs.discovery_server_ref || '3.0.x-devel' }}
+      fastdds_ref: ${{ inputs.fastdds_ref || github.ref || 'master' }}
+      discovery_server_ref: ${{ inputs.discovery_server_ref || 'master' }}
diff --git a/.github/workflows/ubuntu-ci.yml b/.github/workflows/ubuntu-ci.yml
@@ -56,4 +56,4 @@ jobs:
       colcon-args: ${{ inputs.colcon-args }}
       cmake-args: '-DSECURITY=ON ${{ inputs.cmake-args }}'
       ctest-args: ${{ inputs.ctest-args || '-LE xfail' }}
-      fastdds-branch: ${{ inputs.fastdds_branch || github.ref || '3.0.x-devel' }}
+      fastdds-branch: ${{ inputs.fastdds_branch || github.ref || 'master' }}
diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml
@@ -48,4 +48,4 @@ jobs:
       colcon-args: ${{ inputs.colcon-args }}
       cmake-args: '-DSECURITY=ON ${{ inputs.cmake-args }}'
       ctest-args: ${{ inputs.ctest-args }}
-      fastdds_branch: ${{ inputs.fastdds_branch || github.ref || '3.0.x-devel' }}
+      fastdds_branch: ${{ inputs.fastdds_branch || github.ref || 'master' }}
diff --git a/README.md b/README.md
@@ -37,10 +37,10 @@
 
 <br><br>
 
-**IMPORTANT NOTICE**
-
-**Fast DDS is undergoing major changes implicating API breaks.**
-**It is strongly advisable to use the latest stable branch, [2.13.x](https://github.com/eProsima/Fast-DDS/tree/2.13.x), to ensure compilation.**
+<!-- TODO(eduponz): Remove this before releasing v3.0.0 -->
+> [!WARNING]
+> **In preparation for v3.0.0, Fast DDS' master branch is undergoing major changes entailing API breaks.**
+> **Until Fast DDS v3.0.0 is released, it is strongly advisable to use the latest stable branch, [2.14.x](https://github.com/eProsima/Fast-DDS/tree/2.14.x)**.
 
 *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.