Fix conflicts

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
eProsima · Apr 17, 2024 · dceedcb · dceedcb
1 parent e25dd38
commit dceedcb
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 527 deletions.
diff --git a/.github/workflows/address-sanitizers.yaml b/.github/workflows/address-sanitizers.yaml
diff --git a/.github/workflows/nightly-sanitizers-ci.yml b/.github/workflows/nightly-sanitizers-ci.yml
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' }}