Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/docker/ddsrouter/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ WORKDIR /ddsrouter
ARG fastcdr_branch=2.x
ARG fastdds_branch=2.x
ARG devutils_branch=0.x
ARG ddspipe_branch=main
ARG ddsrouter_branch=main
ARG ddspipe_branch=0.x
ARG ddsrouter_branch=2.x

RUN echo "fastcdr branch: <${fastcdr_branch}>" && \
echo "fastdds branch: <${fastdds_branch}>" && \
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/docker-reusable-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,31 +7,31 @@ on:
fastcdr_branch:
description: 'Branch or tag of Fast CDR repository (https://github.com/eProsima/Fast-CDR)'
required: true
default: 'master'
default: '2.x'
type: string

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

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

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

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

custom_version_build:
Expand Down
29 changes: 2 additions & 27 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,40 +15,15 @@ jobs:
dependencies_artifact_postfix: '_nightly'
secrets: inherit

# Uncomment this block to run the tests for Fast DDS v3 when DDS Router is updated
# Also specify here (and above) the workflow version/branch to use (@v0, @main, etc.)
# reusable_tests_v3:
# name: reusable_tests_v3
# uses: ./.github/workflows/reusable-workflow.yml
# with:
# custom_version_build: 'v3'
# dependencies_artifact_postfix: '_nightly'
# secrets: inherit

reusable_docker_tests_v2:
name: reusable_docker_tests_v2
uses: ./.github/workflows/docker-reusable-workflow.yml
with:
fastcdr_branch: '2.x'
fastdds_branch: '2.x'
dev_utils_branch: '0.x'
ddspipe_branch: 'main'
ddsrouter_branch: 'main'
ddspipe_branch: '0.x'
ddsrouter_branch: '2.x'
custom_version_build: 'v2'
dependencies_artifact_postfix: '_nightly'
secrets: inherit

# Uncomment this block to run the tests for Fast DDS v3 when DDS Router is updated
# Also specify here (and above) the workflow version/branch to use (@v0, @main, etc.)
# reusable_docker_tests_v3:
# name: reusable_docker_tests_v3
# uses: ./.github/workflows/docker-reusable-workflow.yml
# with:
# fastcdr_branch: '2.x'
# fastdds_branch: '3.x'
# ddspipe_branch: 'main'
# ddsrouter_branch: 'main'
# custom_version_build: 'v3'
# dependencies_artifact_postfix: '_nightly'
# secrets: inherit

14 changes: 7 additions & 7 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,31 +8,31 @@ on:
fastcdr_branch:
description: 'Branch or tag of Fast CDR repository (https://github.com/eProsima/Fast-CDR)'
required: true
default: 'master'
default: '2.x'
type: string

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

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

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

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

custom_version_build:
Expand Down Expand Up @@ -73,8 +73,8 @@ jobs:
with:
fastcdr_branch: ${{ inputs.fastcdr_branch || '2.x' }}
fastdds_branch: ${{ inputs.fastdds_branch || '2.x' }}
dev_utils_branch: ${{ inputs.dev_utils_branch || 'main' }}
ddspipe_branch: ${{ inputs.ddspipe_branch || 'main' }}
dev_utils_branch: ${{ inputs.dev_utils_branch || '0.x' }}
ddspipe_branch: ${{ inputs.ddspipe_branch || '0.x' }}
ddsrouter_branch: ${{ inputs.ddsrouter_branch || github.head_ref || github.ref_name }}
custom_version_build: ${{ inputs.custom_version_build || 'v2' }}
dependencies_artifact_postfix: ${{ inputs.dependencies_artifact_postfix || '_nightly' }}
Expand Down
4 changes: 2 additions & 2 deletions ddsrouter.repos
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ repositories:
ddspipe:
type: git
url: https://github.com/eProsima/DDS-Pipe.git
version: main
version: 0.x
ddsrouter:
type: git
url: https://github.com/eProsima/DDS-Router.git
version: main
version: 2.x
1 change: 1 addition & 0 deletions docs/rst/spelling_wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ github
gMock
Gtest
guid
infos
IPv
jsonschema
kubernetes
Expand Down
Loading