From a838371175e5579ff8a0250e8885e1538aa8665e Mon Sep 17 00:00:00 2001 From: Miguel Company Date: Wed, 2 Oct 2024 08:39:31 +0200 Subject: [PATCH] Refs #21784. Update top branch in CI workflows. Signed-off-by: Miguel Company --- .github/workflows/mac-ci.yml | 2 +- .github/workflows/reusable-ubuntu-ci.yml | 8 ++++---- .github/workflows/sanitizers-ci.yml | 4 ++-- .github/workflows/ubuntu-ci.yml | 2 +- .github/workflows/windows-ci.yml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/mac-ci.yml b/.github/workflows/mac-ci.yml index 21cf3f2652f..b721f1f6dcb 100644 --- a/.github/workflows/mac-ci.yml +++ b/.github/workflows/mac-ci.yml @@ -53,5 +53,5 @@ 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 || 'master' }} + fastdds-branch: ${{ inputs.fastdds_branch || github.ref || '3.0.x' }} use-ccache: ${{ ((inputs.use-ccache == true) && true) || false }} diff --git a/.github/workflows/reusable-ubuntu-ci.yml b/.github/workflows/reusable-ubuntu-ci.yml index 1c44e356965..19274d76096 100644 --- a/.github/workflows/reusable-ubuntu-ci.yml +++ b/.github/workflows/reusable-ubuntu-ci.yml @@ -31,7 +31,7 @@ on: description: 'Branch or tag of Fast CDR repository (https://github.com/eProsima/Fast-CDR)' required: false type: string - default: 'master' + default: '2.2.x' security: description: 'Enable security features' required: false @@ -470,7 +470,7 @@ jobs: uses: eProsima/eProsima-CI/ubuntu/get_related_branch_from_repo@v0 with: remote_repository: eProsima/Fast-DDS-docs - fallback_branch: master + fallback_branch: '3.0.x' - name: Download Fast DDS documentation repo uses: eProsima/eProsima-CI/external/checkout@v0 @@ -577,7 +577,7 @@ jobs: uses: eProsima/eProsima-CI/ubuntu/get_related_branch_from_repo@v0 with: remote_repository: eProsima/ShapesDemo - fallback_branch: 'master' + fallback_branch: '3.0.x' - name: Download Shapes Demo repo uses: eProsima/eProsima-CI/external/checkout@v0 @@ -657,7 +657,7 @@ jobs: uses: eProsima/eProsima-CI/ubuntu/get_related_branch_from_repo@v0 with: remote_repository: eProsima/Discovery-Server - fallback_branch: 'master' + fallback_branch: '2.0.x' - name: Download Discovery Server repo uses: eProsima/eProsima-CI/external/checkout@v0 diff --git a/.github/workflows/sanitizers-ci.yml b/.github/workflows/sanitizers-ci.yml index e4ec25ec298..71a15998d9f 100644 --- 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 || '3.0.x' }} + discovery_server_ref: ${{ inputs.discovery_server_ref || '2.0.x' }} diff --git a/.github/workflows/ubuntu-ci.yml b/.github/workflows/ubuntu-ci.yml index a2601850577..4c18d5eaa3b 100644 --- a/.github/workflows/ubuntu-ci.yml +++ b/.github/workflows/ubuntu-ci.yml @@ -64,7 +64,7 @@ jobs: colcon-args: ${{ inputs.colcon-args }} cmake-args: ${{ inputs.cmake-args }} ctest-args: ${{ inputs.ctest-args || '-LE xfail' }} - fastdds-branch: ${{ inputs.fastdds_branch || github.ref || 'master' }} + fastdds-branch: ${{ inputs.fastdds_branch || github.ref || '3.0.x' }} security: ${{ ((inputs.security == true) && true) || github.event_name == 'pull_request' }} run-build: ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'skip-ci') }} run-tests: ${{ ((inputs.run-tests == true) && true) || (github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'no-test')) }} diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml index d33b39bb693..382b40ac974 100644 --- 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 || 'master' }} + fastdds_branch: ${{ inputs.fastdds_branch || github.ref || '3.0.x' }}