From 7812e692a49c91467fa1edf29b130b37cbea3e0d Mon Sep 17 00:00:00 2001 From: Eduardo Ponz Segrelles Date: Sat, 9 Mar 2024 13:58:08 +0100 Subject: [PATCH] Fix input branch on reusable windows CI (#4539) Signed-off-by: EduPonz (cherry picked from commit a97e7ab7da27fecd9a0f4c6dbba7b500cc18b388) # Conflicts: # .github/workflows/ubuntu-ci.yml --- .github/workflows/reusable-windows-ci.yml | 2 +- .github/workflows/ubuntu-ci.yml | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/reusable-windows-ci.yml b/.github/workflows/reusable-windows-ci.yml index 6ab829d5144..5da14a84ffc 100644 --- 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 index b88767c740e..4dcb3a43a0d 100644 --- 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))