diff --git a/.github/workflows/ubuntu-ci.yml b/.github/workflows/ubuntu-ci.yml index 593cfc6fd..a706882b4 100644 --- a/.github/workflows/ubuntu-ci.yml +++ b/.github/workflows/ubuntu-ci.yml @@ -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'))) }} diff --git a/docs/conf.py b/docs/conf.py index 0c2a9c12c..f27ea8a40 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -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