Skip to content

Commit 5bdb8b4

Browse files
Fix .repos (#506)
* Refs #23233: Fix .repos Signed-off-by: cferreiragonz <carlosferreira@eprosima.com> * Refs #23233: Use fixed versions for CI Signed-off-by: cferreiragonz <carlosferreira@eprosima.com> * Refs #23233: Update spelling wordlist Signed-off-by: cferreiragonz <carlosferreira@eprosima.com> * Refs #23233: Use fixed versions for CI also in Docker Signed-off-by: cferreiragonz <carlosferreira@eprosima.com> --------- Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
1 parent 9b94f38 commit 5bdb8b4

File tree

6 files changed

+19
-43
lines changed

6 files changed

+19
-43
lines changed

.github/docker/ddsrouter/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ WORKDIR /ddsrouter
4545
ARG fastcdr_branch=2.x
4646
ARG fastdds_branch=2.x
4747
ARG devutils_branch=0.x
48-
ARG ddspipe_branch=main
49-
ARG ddsrouter_branch=main
48+
ARG ddspipe_branch=0.x
49+
ARG ddsrouter_branch=2.x
5050

5151
RUN echo "fastcdr branch: <${fastcdr_branch}>" && \
5252
echo "fastdds branch: <${fastdds_branch}>" && \

.github/workflows/docker-reusable-workflow.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,31 @@ on:
77
fastcdr_branch:
88
description: 'Branch or tag of Fast CDR repository (https://github.com/eProsima/Fast-CDR)'
99
required: true
10-
default: 'master'
10+
default: '2.x'
1111
type: string
1212

1313
fastdds_branch:
1414
description: 'Branch or tag of Fast DDS repository (https://github.com/eProsima/Fast-DDS)'
1515
required: true
16-
default: 'master'
16+
default: '2.x'
1717
type: string
1818

1919
dev_utils_branch:
2020
description: 'Branch or tag of eProsima/dev-utils repository (https://github.com/eProsima/dev-utils)'
2121
required: true
22-
default: 'main'
22+
default: '0.x'
2323
type: string
2424

2525
ddspipe_branch:
2626
description: 'Branch or tag of DDS Pipe repository (https://github.com/eProsima/DDS-Pipe)'
2727
required: true
28-
default: 'main'
28+
default: '0.x'
2929
type: string
3030

3131
ddsrouter_branch:
3232
description: 'Branch or tag of DDS Router repository (https://github.com/eProsima/DDS-Router)'
3333
required: true
34-
default: 'main'
34+
default: '2.x'
3535
type: string
3636

3737
custom_version_build:

.github/workflows/nightly.yml

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -15,40 +15,15 @@ jobs:
1515
dependencies_artifact_postfix: '_nightly'
1616
secrets: inherit
1717

18-
# Uncomment this block to run the tests for Fast DDS v3 when DDS Router is updated
19-
# Also specify here (and above) the workflow version/branch to use (@v0, @main, etc.)
20-
# reusable_tests_v3:
21-
# name: reusable_tests_v3
22-
# uses: ./.github/workflows/reusable-workflow.yml
23-
# with:
24-
# custom_version_build: 'v3'
25-
# dependencies_artifact_postfix: '_nightly'
26-
# secrets: inherit
27-
2818
reusable_docker_tests_v2:
2919
name: reusable_docker_tests_v2
3020
uses: ./.github/workflows/docker-reusable-workflow.yml
3121
with:
3222
fastcdr_branch: '2.x'
3323
fastdds_branch: '2.x'
3424
dev_utils_branch: '0.x'
35-
ddspipe_branch: 'main'
36-
ddsrouter_branch: 'main'
25+
ddspipe_branch: '0.x'
26+
ddsrouter_branch: '2.x'
3727
custom_version_build: 'v2'
3828
dependencies_artifact_postfix: '_nightly'
3929
secrets: inherit
40-
41-
# Uncomment this block to run the tests for Fast DDS v3 when DDS Router is updated
42-
# Also specify here (and above) the workflow version/branch to use (@v0, @main, etc.)
43-
# reusable_docker_tests_v3:
44-
# name: reusable_docker_tests_v3
45-
# uses: ./.github/workflows/docker-reusable-workflow.yml
46-
# with:
47-
# fastcdr_branch: '2.x'
48-
# fastdds_branch: '3.x'
49-
# ddspipe_branch: 'main'
50-
# ddsrouter_branch: 'main'
51-
# custom_version_build: 'v3'
52-
# dependencies_artifact_postfix: '_nightly'
53-
# secrets: inherit
54-

.github/workflows/test.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,31 @@ on:
88
fastcdr_branch:
99
description: 'Branch or tag of Fast CDR repository (https://github.com/eProsima/Fast-CDR)'
1010
required: true
11-
default: 'master'
11+
default: '2.x'
1212
type: string
1313

1414
fastdds_branch:
1515
description: 'Branch or tag of Fast DDS repository (https://github.com/eProsima/Fast-DDS)'
1616
required: true
17-
default: 'master'
17+
default: '2.x'
1818
type: string
1919

2020
dev_utils_branch:
2121
description: 'Branch or tag of eProsima/dev-utils repository (https://github.com/eProsima/dev-utils)'
2222
required: true
23-
default: 'main'
23+
default: '0.x'
2424
type: string
2525

2626
ddspipe_branch:
2727
description: 'Branch or tag of DDS Pipe repository (https://github.com/eProsima/DDS-Pipe)'
2828
required: true
29-
default: 'main'
29+
default: '0.x'
3030
type: string
3131

3232
ddsrouter_branch:
3333
description: 'Branch or tag of DDS Router repository (https://github.com/eProsima/DDS-Router)'
3434
required: true
35-
default: 'main'
35+
default: '2.x'
3636
type: string
3737

3838
custom_version_build:
@@ -73,8 +73,8 @@ jobs:
7373
with:
7474
fastcdr_branch: ${{ inputs.fastcdr_branch || '2.x' }}
7575
fastdds_branch: ${{ inputs.fastdds_branch || '2.x' }}
76-
dev_utils_branch: ${{ inputs.dev_utils_branch || 'main' }}
77-
ddspipe_branch: ${{ inputs.ddspipe_branch || 'main' }}
76+
dev_utils_branch: ${{ inputs.dev_utils_branch || '0.x' }}
77+
ddspipe_branch: ${{ inputs.ddspipe_branch || '0.x' }}
7878
ddsrouter_branch: ${{ inputs.ddsrouter_branch || github.head_ref || github.ref_name }}
7979
custom_version_build: ${{ inputs.custom_version_build || 'v2' }}
8080
dependencies_artifact_postfix: ${{ inputs.dependencies_artifact_postfix || '_nightly' }}

ddsrouter.repos

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ repositories:
1818
ddspipe:
1919
type: git
2020
url: https://github.com/eProsima/DDS-Pipe.git
21-
version: main
21+
version: 0.x
2222
ddsrouter:
2323
type: git
2424
url: https://github.com/eProsima/DDS-Router.git
25-
version: main
25+
version: 2.x

docs/rst/spelling_wordlist.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ github
2626
gMock
2727
Gtest
2828
guid
29+
infos
2930
IPv
3031
jsonschema
3132
kubernetes

0 commit comments

Comments
 (0)