Fix conflicts

Signed-off-by: JesusPoderoso <[email protected]>
eProsima · Apr 18, 2024 · 706a7ae · 706a7ae
1 parent e25dd38
commit 706a7ae
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 542 deletions.
diff --git a/.github/workflows/address-sanitizers.yaml b/.github/workflows/address-sanitizers.yaml
diff --git a/.github/workflows/config/asan_colcon.meta b/.github/workflows/config/asan_colcon.meta
@@ -1,16 +1,6 @@
 names:
     fastrtps:
         cmake-args:
-<<<<<<< HEAD
-            - "-DCMAKE_BUILD_TYPE=Debug"
-            - "-DEPROSIMA_BUILD_TESTS=ON"
-            - "-DGTEST_INDIVIDUAL=ON"
-            - "-DRTPS_API_TESTS=ON"
-            - "-DFASTRTPS_API_TESTS=ON"
-            - "-DFASTDDS_PIM_API_TESTS=ON"
-            - "-DPERFORMANCE_TESTS=ON"
-=======
->>>>>>> ac0e737a9 (Refactor Github CI sanitizer related jobs (#4662))
             - "-DNO_TLS=OFF"
             - "-DSECURITY=ON"
             - "-DFASTDDS_STATISTICS=ON"

diff --git a/.github/workflows/nightly-sanitizers-ci.yml b/.github/workflows/nightly-sanitizers-ci.yml
diff --git a/.github/workflows/reusable-sanitizers-ci.yml b/.github/workflows/reusable-sanitizers-ci.yml
@@ -77,7 +77,7 @@ jobs:
       - name: Get minimum supported version of CMake
         uses: eProsima/eProsima-CI/external/get-cmake@v0
         with:
-          cmakeVersion: '3.22.6'
+          cmakeVersion: '3.16.3'
 
       - name: Install apt packages
         uses: eProsima/eProsima-CI/ubuntu/install_apt_packages@v0
@@ -145,7 +145,7 @@ jobs:
       - name: Get minimum supported version of CMake
         uses: eProsima/eProsima-CI/external/get-cmake@v0
         with:
-          cmakeVersion: '3.22.6'
+          cmakeVersion: '3.16.3'
 
       - name: Install apt packages
         uses: eProsima/eProsima-CI/ubuntu/install_apt_packages@v0
@@ -175,7 +175,7 @@ jobs:
           colcon_meta_file: ${{ github.workspace }}/src/fastrtps/.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 -DFASTRTPS_API_TESTS=ON -DFASTDDS_PIM_API_TESTS=ON -DPERFORMANCE_TESTS=ON
+          cmake_args_default: -DEPROSIMA_BUILD_TESTS=ON -DGTEST_INDIVIDUAL=ON -DRTPS_API_TESTS=ON -DFASTRTPS_API_TESTS=ON -DFASTDDS_PIM_API_TESTS=ON -DPERFORMANCE_TESTS=ON
           cmake_build_type: 'Debug'
           workspace: ${{ github.workspace }}
           workspace_dependencies: ''
@@ -228,7 +228,7 @@ jobs:
       - name: Get minimum supported version of CMake
         uses: eProsima/eProsima-CI/external/get-cmake@v0
         with:
-          cmakeVersion: '3.22.6'
+          cmakeVersion: '3.16.3'
 
       - name: Install apt packages
         uses: eProsima/eProsima-CI/ubuntu/install_apt_packages@v0
@@ -338,7 +338,7 @@ jobs:
       - name: Get minimum supported version of CMake
         uses: eProsima/eProsima-CI/external/get-cmake@v0
         with:
-          cmakeVersion: '3.22.6'
+          cmakeVersion: '3.16.3'
 
       - name: Install apt packages
         uses: eProsima/eProsima-CI/ubuntu/install_apt_packages@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 || 'master' }}
-      discovery_server_ref: ${{ inputs.discovery_server_ref || 'master' }}
+      fastdds_ref: ${{ inputs.fastdds_ref || github.ref || '2.10.x' }}
+      discovery_server_ref: ${{ inputs.discovery_server_ref || 'v1.2.1' }}