Fix input branch on reusable windows CI (#4539)

Signed-off-by: EduPonz <eduardoponz@eprosima.com> (cherry picked from commit a97e7ab) # Conflicts: # .github/workflows/ubuntu-ci.yml
eProsima · Mar 9, 2024 · 7812e69 · 7812e69
1 parent 9fc686b
commit 7812e69
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/.github/workflows/reusable-windows-ci.yml b/.github/workflows/reusable-windows-ci.yml
@@ -46,7 +46,7 @@ jobs:
         with:
           path: src/fastrtps
           submodules: true
-          ref: ${{ inputs.fastdds-branch }}
+          ref: ${{ inputs.fastdds_branch }}
 
       - name: Get minimum supported version of CMake
         uses: lukka/get-cmake@latest

diff --git a/.github/workflows/ubuntu-ci.yml b/.github/workflows/ubuntu-ci.yml
@@ -42,6 +42,12 @@ jobs:
       os-image: ${{ matrix.os-image }}
       label: ${{ inputs.label || 'ubuntu-ci' }}
       colcon-args: ${{ inputs.colcon-args }}
+<<<<<<< HEAD
       cmake-args: ${{ inputs.cmake-args || "-DSECURITY=ON" }}
       ctest-args: ${{ inputs.ctest-args || "-LE xfail" }}
       fastdds-branch: ${{ inputs.fastdds_branch || github.ref || '2.10.x' }}
+=======
+      cmake-args: ${{ inputs.cmake-args || '-DSECURITY=ON' }}
+      ctest-args: ${{ inputs.ctest-args || '-LE xfail' }}
+      fastdds-branch: ${{ inputs.fastdds_branch || github.ref || 'master' }}
+>>>>>>> a97e7ab7d (Fix input branch on reusable windows CI (#4539))