Skip to content

Commit

Permalink
Refs #21114: TODO DROP - Check against Fast DDS branch
Browse files Browse the repository at this point in the history
Signed-off-by: JesusPoderoso <[email protected]>
  • Loading branch information
JesusPoderoso committed Jul 3, 2024
1 parent 8d3700f commit ea53edb
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
cmake-args: ${{ inputs.cmake-args }}
ctest-args: ${{ inputs.ctest-args }}
fastdds-docs-branch: ${{ inputs.fastdds-docs-branch || github.ref }}
fastdds-branch: ${{ inputs.fastdds-branch || '2.13.x' }}
fastdds-branch: ${{ inputs.fastdds-branch || 'mergify/bp/2.13.x/pr-5016' }}
fastdds-python-branch: ${{ inputs.fastdds-python-branch || '1.4.x' }}
run-build: ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'skip-ci') }}
run-tests: ${{ (inputs.run-tests == true) || ((github.event_name == 'pull_request') && (!contains(github.event.pull_request.labels.*.name, 'no-test'))) }}
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ def configure_doxyfile(
fastdds.refs.__contains__('origin/{}'.format(fastdds_branch))):
fastdds_branch = 'origin/{}'.format(fastdds_branch)
else:
fastdds_branch = 'origin/2.13.x'
fastdds_branch = 'origin/mergify/bp/2.13.x/pr-5016'
print(f'Fast DDS branch is not set by env var. Using "{fastdds_branch}"')

# Actual checkout
Expand Down

0 comments on commit ea53edb

Please sign in to comment.