Skip to content

Commit

Permalink
Refs #21784. Update top branch in CI workflows.
Browse files Browse the repository at this point in the history
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
  • Loading branch information
MiguelCompany committed Oct 2, 2024
1 parent 77ebd4e commit a838371
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/mac-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
8 changes: 4 additions & 4 deletions .github/workflows/reusable-ubuntu-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sanitizers-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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')) }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}

0 comments on commit a838371

Please sign in to comment.