Skip to content

Commit 2868bde

Browse files
Update fallback branches to use environment variables (#6039) (#6044)
* Update fallback branches to use environment variables (#6039) Signed-off-by: Miguel Company <[email protected]> (cherry picked from commit 50ff229) # Conflicts: # .github/workflows/reusable-ubuntu-ci.yml * Fix conflicts and update supported branches Signed-off-by: Miguel Company <[email protected]> --------- Signed-off-by: Miguel Company <[email protected]> Co-authored-by: Miguel Company <[email protected]>
1 parent 28529b7 commit 2868bde

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

.github/workflows/reusable-ubuntu-ci.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,11 @@ on:
6161
env:
6262
security-cmake-flag: ${{ inputs.security == true && '-DSECURITY=ON' || '-DSECURITY=OFF' }}
6363
colcon-build-default-cmake-args: '-DCMAKE_CXX_FLAGS="-Werror -Wall -Wextra -Wpedantic -Wunused-value -Woverloaded-virtual"'
64+
fastdds-python-branch: '1.4.x'
65+
fastdds-docs-branch: '2.14.x'
66+
shapes-demo-branch: '2.14.x'
67+
discovery-server-branch: '1.2.x'
68+
6469
defaults:
6570
run:
6671
shell: bash
@@ -313,7 +318,7 @@ jobs:
313318
uses: eProsima/eProsima-CI/ubuntu/get_related_branch_from_repo@v0
314319
with:
315320
remote_repository: eProsima/Fast-DDS-python
316-
fallback_branch: '1.4.x'
321+
fallback_branch: ${{ env.fastdds-python-branch }}
317322

318323
- name: Download Fast DDS Python repo
319324
uses: eProsima/eProsima-CI/external/checkout@v0
@@ -476,7 +481,7 @@ jobs:
476481
uses: eProsima/eProsima-CI/ubuntu/get_related_branch_from_repo@v0
477482
with:
478483
remote_repository: eProsima/Fast-DDS-docs
479-
fallback_branch: '2.14.x'
484+
fallback_branch: ${{ env.fastdds-docs-branch }}
480485

481486
- name: Download Fast DDS documentation repo
482487
uses: eProsima/eProsima-CI/external/checkout@v0
@@ -583,7 +588,7 @@ jobs:
583588
uses: eProsima/eProsima-CI/ubuntu/get_related_branch_from_repo@v0
584589
with:
585590
remote_repository: eProsima/ShapesDemo
586-
fallback_branch: '2.14.x'
591+
fallback_branch: ${{ env.shapes-demo-branch }}
587592

588593
- name: Download Shapes Demo repo
589594
uses: eProsima/eProsima-CI/external/checkout@v0
@@ -663,7 +668,7 @@ jobs:
663668
uses: eProsima/eProsima-CI/ubuntu/get_related_branch_from_repo@v0
664669
with:
665670
remote_repository: eProsima/Discovery-Server
666-
fallback_branch: '1.2.x'
671+
fallback_branch: ${{ env.discovery-server-branch }}
667672

668673
- name: Download Discovery Server repo
669674
uses: eProsima/eProsima-CI/external/checkout@v0

0 commit comments

Comments
 (0)