From a35d627880dfa13f0de4ea82fbe18babe17ab2c9 Mon Sep 17 00:00:00 2001 From: cferreiragonz Date: Mon, 26 May 2025 10:55:50 +0200 Subject: [PATCH 1/4] Refs #23233: Fix .repos Signed-off-by: cferreiragonz --- ddsrouter.repos | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ddsrouter.repos b/ddsrouter.repos index 77d5eaf74..817496029 100644 --- a/ddsrouter.repos +++ b/ddsrouter.repos @@ -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 From a7ed8ca934421700d32cdec6d4154080ed674899 Mon Sep 17 00:00:00 2001 From: cferreiragonz Date: Wed, 28 May 2025 11:03:59 +0200 Subject: [PATCH 2/4] Refs #23233: Use fixed versions for CI Signed-off-by: cferreiragonz --- .github/workflows/docker-reusable-workflow.yml | 10 +++++----- .github/workflows/nightly.yml | 4 ++-- .github/workflows/test.yml | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/docker-reusable-workflow.yml b/.github/workflows/docker-reusable-workflow.yml index e9b201ff7..2a521878c 100644 --- a/.github/workflows/docker-reusable-workflow.yml +++ b/.github/workflows/docker-reusable-workflow.yml @@ -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: diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 40db8e77c..fe588fe5d 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -32,8 +32,8 @@ jobs: 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 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 477ed8175..c50d73f61 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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: From d2dfa1320798cb9ab2f7c602ad22b66329995346 Mon Sep 17 00:00:00 2001 From: cferreiragonz Date: Wed, 28 May 2025 11:04:16 +0200 Subject: [PATCH 3/4] Refs #23233: Update spelling wordlist Signed-off-by: cferreiragonz --- docs/rst/spelling_wordlist.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/rst/spelling_wordlist.txt b/docs/rst/spelling_wordlist.txt index b3f2c3d16..a9b8f037a 100644 --- a/docs/rst/spelling_wordlist.txt +++ b/docs/rst/spelling_wordlist.txt @@ -26,6 +26,7 @@ github gMock Gtest guid +infos IPv jsonschema kubernetes From 10de52ac95345bd03238905d6a6dba7549420d53 Mon Sep 17 00:00:00 2001 From: cferreiragonz Date: Wed, 28 May 2025 17:32:53 +0200 Subject: [PATCH 4/4] Refs #23233: Use fixed versions for CI also in Docker Signed-off-by: cferreiragonz --- .github/docker/ddsrouter/Dockerfile | 4 ++-- .github/workflows/nightly.yml | 25 ------------------------- .github/workflows/test.yml | 4 ++-- 3 files changed, 4 insertions(+), 29 deletions(-) diff --git a/.github/docker/ddsrouter/Dockerfile b/.github/docker/ddsrouter/Dockerfile index 6ec2d4f7b..fc5236f2d 100644 --- a/.github/docker/ddsrouter/Dockerfile +++ b/.github/docker/ddsrouter/Dockerfile @@ -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}>" && \ diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index fe588fe5d..6e719bdda 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -15,16 +15,6 @@ 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 @@ -37,18 +27,3 @@ jobs: 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 - diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c50d73f61..f26b51481 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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' }}