From 5d8653414b080c7b27e570b42076feba7983f47d Mon Sep 17 00:00:00 2001 From: JesusPoderoso Date: Tue, 12 Mar 2024 08:19:33 +0100 Subject: [PATCH 1/2] Refs #20542: Include 3.0.x nightys Signed-off-by: JesusPoderoso --- .github/workflows/nightly-mac-ci.yml | 8 ++++++++ .github/workflows/nightly-ubuntu-ci.yml | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/.github/workflows/nightly-mac-ci.yml b/.github/workflows/nightly-mac-ci.yml index 5e2ea77743..109d6a16cb 100644 --- a/.github/workflows/nightly-mac-ci.yml +++ b/.github/workflows/nightly-mac-ci.yml @@ -39,3 +39,11 @@ jobs: cmake-args: "-DSECURITY=OFF" ctest-args: "-LE xfail" fastdds-branch: '${{ matrix.fastdds-branch }}' + + nightly-3_0_x-mac-ci: + uses: ./.github/workflows/reusable-mac-ci.yml + with: + label: 'nightly-3.0.x-mac-ci' + cmake-args: "-DSECURITY=ON" + ctest-args: "-LE xfail" + fastdds-branch: '3.0.x-devel' diff --git a/.github/workflows/nightly-ubuntu-ci.yml b/.github/workflows/nightly-ubuntu-ci.yml index c8318e0865..31b32522eb 100644 --- a/.github/workflows/nightly-ubuntu-ci.yml +++ b/.github/workflows/nightly-ubuntu-ci.yml @@ -27,3 +27,11 @@ jobs: cmake-args: "-DSECURITY=ON" ctest-args: "-LE xfail" fastdds-branch: '${{ matrix.fastdds-branch }}' + + nightly-3_0_x-ubuntu-ci: + uses: ./.github/workflows/reusable-ubuntu-ci.yml + with: + label: 'nightly-3.0.x-ubuntu-ci' + cmake-args: "-DSECURITY=ON" + ctest-args: "-LE xfail" + fastdds-branch: '3.0.x-devel' From e50670dad024a4de3538428b2d13ed0854c356d9 Mon Sep 17 00:00:00 2001 From: JesusPoderoso Date: Tue, 12 Mar 2024 08:25:47 +0100 Subject: [PATCH 2/2] Refs #20542: Simplify workflow Signed-off-by: JesusPoderoso --- .github/workflows/nightly-mac-ci.yml | 9 +-------- .github/workflows/nightly-ubuntu-ci.yml | 10 +--------- .github/workflows/nightly-windows-ci.yml | 9 +-------- 3 files changed, 3 insertions(+), 25 deletions(-) diff --git a/.github/workflows/nightly-mac-ci.yml b/.github/workflows/nightly-mac-ci.yml index 109d6a16cb..09301eb120 100644 --- a/.github/workflows/nightly-mac-ci.yml +++ b/.github/workflows/nightly-mac-ci.yml @@ -16,6 +16,7 @@ jobs: - '2.12.x' - '2.10.x' - '2.6.x' + - '3.0.x-devel' uses: ./.github/workflows/reusable-mac-ci.yml with: label: 'nightly-sec-mac-ci-${{ matrix.fastdds-branch }}' @@ -39,11 +40,3 @@ jobs: cmake-args: "-DSECURITY=OFF" ctest-args: "-LE xfail" fastdds-branch: '${{ matrix.fastdds-branch }}' - - nightly-3_0_x-mac-ci: - uses: ./.github/workflows/reusable-mac-ci.yml - with: - label: 'nightly-3.0.x-mac-ci' - cmake-args: "-DSECURITY=ON" - ctest-args: "-LE xfail" - fastdds-branch: '3.0.x-devel' diff --git a/.github/workflows/nightly-ubuntu-ci.yml b/.github/workflows/nightly-ubuntu-ci.yml index 31b32522eb..075b511a9f 100644 --- a/.github/workflows/nightly-ubuntu-ci.yml +++ b/.github/workflows/nightly-ubuntu-ci.yml @@ -19,7 +19,7 @@ jobs: - '2.12.x' - '2.10.x' - '2.6.x' - + - '3.0.x-devel' uses: ./.github/workflows/reusable-ubuntu-ci.yml with: os-image: ${{ matrix.os-image }} @@ -27,11 +27,3 @@ jobs: cmake-args: "-DSECURITY=ON" ctest-args: "-LE xfail" fastdds-branch: '${{ matrix.fastdds-branch }}' - - nightly-3_0_x-ubuntu-ci: - uses: ./.github/workflows/reusable-ubuntu-ci.yml - with: - label: 'nightly-3.0.x-ubuntu-ci' - cmake-args: "-DSECURITY=ON" - ctest-args: "-LE xfail" - fastdds-branch: '3.0.x-devel' diff --git a/.github/workflows/nightly-windows-ci.yml b/.github/workflows/nightly-windows-ci.yml index 2f60212c4d..904f61df4f 100644 --- a/.github/workflows/nightly-windows-ci.yml +++ b/.github/workflows/nightly-windows-ci.yml @@ -16,6 +16,7 @@ jobs: - '2.12.x' - '2.10.x' - '2.6.x' + - '3.0.x-devel' uses: ./.github/workflows/reusable-windows-ci.yml with: label: 'nightly-sec-windows-ci-${{ matrix.fastdds-branch }}' @@ -39,11 +40,3 @@ jobs: cmake-args: "-DSECURITY=OFF" ctest-args: "-LE xfail" fastdds_branch: '${{ matrix.fastdds-branch }}' - - nightly-3_0_x-windows-ci: - uses: ./.github/workflows/reusable-windows-ci.yml - with: - label: 'nightly-3.0.x-windows-ci' - cmake-args: "-DSECURITY=ON" - ctest-args: "-LE xfail" - fastdds_branch: '3.0.x-devel'