From 74bb15af36f50023951c29493bfa208290939d27 Mon Sep 17 00:00:00 2001 From: JesusPoderoso Date: Tue, 20 Feb 2024 16:38:30 +0100 Subject: [PATCH 1/2] Refs #20393: Add 3.0.x-devel workflow Signed-off-by: JesusPoderoso --- .github/workflows/build_and_test.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 04c10899..cef866e0 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -10,11 +10,11 @@ on: fastcdr_versions: description: 'Fast CDR branches to be used' required: false - default: '["1.1.x", "master"]' + default: '["master"]' fastdds_branch: description: 'Fast DDS branch to be used' required: false - default: 'master' + default: '3.0.x-devel' pull_request: push: branches: @@ -34,9 +34,9 @@ jobs: matrix: foonathan_memory_vendor_version: - ${{ github.event.inputs.foonathan_memory_vendor_branch || 'master' }} - fastcdr_version: ${{ fromJson(github.event.inputs.fastcdr_versions || '["1.1.x", "master"]') }} + fastcdr_version: ${{ fromJson(github.event.inputs.fastcdr_versions || '["master"]') }} fastdds_version: - - ${{ github.event.inputs.fastdds_branch || 'master' }} + - ${{ github.event.inputs.fastdds_branch || '3.0.x-devel' }} env: CXXFLAGS: /MP @@ -153,9 +153,9 @@ jobs: matrix: foonathan_memory_vendor_version: - ${{ github.event.inputs.foonathan_memory_vendor_branch || 'master' }} - fastcdr_version: ${{ fromJson(github.event.inputs.fastcdr_versions || '["1.1.x", "master"]') }} + fastcdr_version: ${{ fromJson(github.event.inputs.fastcdr_versions || '["master"]') }} fastdds_version: - - ${{ github.event.inputs.fastdds_branch || 'master' }} + - ${{ github.event.inputs.fastdds_branch || '3.0.x-devel' }} steps: From a2ea03af64550a6aa41d6a398be576762c9a378c Mon Sep 17 00:00:00 2001 From: JesusPoderoso Date: Wed, 21 Feb 2024 08:54:44 +0100 Subject: [PATCH 2/2] Refs #20393: Apply rev suggestion Signed-off-by: JesusPoderoso --- .github/workflows/build_and_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index cef866e0..65354826 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -18,7 +18,7 @@ on: pull_request: push: branches: - - main + - 3.0.x-devel schedule: - cron: '0 0 * * *'