From 83a2b2986bbe502aa371c5db8b2adddf47c2024f Mon Sep 17 00:00:00 2001 From: Mario Dominguez Date: Wed, 3 Jul 2024 08:27:34 +0200 Subject: [PATCH 1/3] Refs #21244: Remove 2.6.x nightly jobs Signed-off-by: Mario Dominguez --- .github/workflows/nightly-mac-ci.yml | 14 -------------- .github/workflows/nightly-ubuntu-ci.yml | 18 ------------------ .github/workflows/nightly-windows-ci.yml | 13 ------------- 3 files changed, 45 deletions(-) diff --git a/.github/workflows/nightly-mac-ci.yml b/.github/workflows/nightly-mac-ci.yml index f137f1c8f1a..8453d0e0409 100644 --- a/.github/workflows/nightly-mac-ci.yml +++ b/.github/workflows/nightly-mac-ci.yml @@ -66,17 +66,3 @@ jobs: fastdds-branch: '2.10.x' use-ccache: false - nightly-mac-ci-2_6_x: - strategy: - fail-fast: false - matrix: - security: - - 'ON' - - 'OFF' - uses: eProsima/Fast-DDS/.github/workflows/reusable-mac-ci.yml@2.6.x - with: - label: 'nightly-sec-${{ matrix.security }}-mac-ci-2.6.x' - cmake-args: "-DSECURITY=${{ matrix.security }}" - ctest-args: "-LE xfail" - fastdds-branch: '2.6.x' - use-ccache: false diff --git a/.github/workflows/nightly-ubuntu-ci.yml b/.github/workflows/nightly-ubuntu-ci.yml index 774a44b683e..4a231cb222b 100644 --- a/.github/workflows/nightly-ubuntu-ci.yml +++ b/.github/workflows/nightly-ubuntu-ci.yml @@ -82,21 +82,3 @@ jobs: run-tests: true use-ccache: false - nightly-ubuntu-ci-2_6_x: - strategy: - fail-fast: false - matrix: - os-image: - - 'ubuntu-22.04' - security: - - true - - false - uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@2.6.x - with: - os-image: ${{ matrix.os-image }} - label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-2.6.x' - ctest-args: "-LE xfail" - fastdds-branch: '2.6.x' - security: ${{ matrix.security }} - run-tests: true - use-ccache: false diff --git a/.github/workflows/nightly-windows-ci.yml b/.github/workflows/nightly-windows-ci.yml index edaf8226b1c..1d3f88bf2df 100644 --- a/.github/workflows/nightly-windows-ci.yml +++ b/.github/workflows/nightly-windows-ci.yml @@ -62,16 +62,3 @@ jobs: ctest-args: "-LE xfail" fastdds_branch: '2.10.x' - nightly-windows-ci-2_6_x: - strategy: - fail-fast: false - matrix: - security: - - 'ON' - - 'OFF' - uses: eProsima/Fast-DDS/.github/workflows/reusable-windows-ci.yml@2.6.x - with: - label: 'nightly-sec-${{ matrix.security }}-windows-ci-2.6.x' - cmake-args: "-DSECURITY=${{ matrix.security }}" - ctest-args: "-LE xfail" - fastdds_branch: '2.6.x' From abf0e02555c3151848aa76b5af6dd50be304cbb2 Mon Sep 17 00:00:00 2001 From: Mario Dominguez Date: Wed, 3 Jul 2024 08:27:52 +0200 Subject: [PATCH 2/3] Refs #21244: Add 2.6.x weekly jobs Signed-off-by: Mario Dominguez --- .github/workflows/weekly-mac-ci.yml | 23 +++++++++++++++++++++ .github/workflows/weekly-ubuntu-ci.yml | 27 +++++++++++++++++++++++++ .github/workflows/weekly-windows-ci.yml | 22 ++++++++++++++++++++ 3 files changed, 72 insertions(+) create mode 100644 .github/workflows/weekly-mac-ci.yml create mode 100644 .github/workflows/weekly-ubuntu-ci.yml create mode 100644 .github/workflows/weekly-windows-ci.yml diff --git a/.github/workflows/weekly-mac-ci.yml b/.github/workflows/weekly-mac-ci.yml new file mode 100644 index 00000000000..f420519d395 --- /dev/null +++ b/.github/workflows/weekly-mac-ci.yml @@ -0,0 +1,23 @@ +name: Fast DDS MacOS CI (weekly) + +on: + workflow_dispatch: + schedule: + - cron: '0 * * * 1' # Run at minute 0 on Monday + +jobs: + + weekly-mac-ci-2_6_x: + strategy: + fail-fast: false + matrix: + security: + - 'ON' + - 'OFF' + uses: eProsima/Fast-DDS/.github/workflows/reusable-mac-ci.yml@2.6.x + with: + label: 'weekly-sec-${{ matrix.security }}-mac-ci-2.6.x' + cmake-args: "-DSECURITY=${{ matrix.security }}" + ctest-args: "-LE xfail" + fastdds-branch: '2.6.x' + use-ccache: false diff --git a/.github/workflows/weekly-ubuntu-ci.yml b/.github/workflows/weekly-ubuntu-ci.yml new file mode 100644 index 00000000000..e9593447cdd --- /dev/null +++ b/.github/workflows/weekly-ubuntu-ci.yml @@ -0,0 +1,27 @@ +name: Fast DDS Ubuntu CI (weekly) + +on: + workflow_dispatch: + schedule: + - cron: '0 * * * 1' # Run at minute 0 on Monday + +jobs: + + weekly-ubuntu-ci-2_6_x: + strategy: + fail-fast: false + matrix: + os-image: + - 'ubuntu-22.04' + security: + - true + - false + uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@2.6.x + with: + os-image: ${{ matrix.os-image }} + label: '${{ matrix.os-image }}-weekly-sec-${{ matrix.security }}-ubuntu-ci-2.6.x' + ctest-args: "-LE xfail" + fastdds-branch: '2.6.x' + security: ${{ matrix.security }} + run-tests: true + use-ccache: false diff --git a/.github/workflows/weekly-windows-ci.yml b/.github/workflows/weekly-windows-ci.yml new file mode 100644 index 00000000000..69557b0f726 --- /dev/null +++ b/.github/workflows/weekly-windows-ci.yml @@ -0,0 +1,22 @@ +name: Fast DDS Windows CI (weekly) + +on: + workflow_dispatch: + schedule: + - cron: '0 * * * 1' # Run at minute 0 on Monday + +jobs: + + weekly-windows-ci-2_6_x: + strategy: + fail-fast: false + matrix: + security: + - 'ON' + - 'OFF' + uses: eProsima/Fast-DDS/.github/workflows/reusable-windows-ci.yml@2.6.x + with: + label: 'weekly-sec-${{ matrix.security }}-windows-ci-2.6.x' + cmake-args: "-DSECURITY=${{ matrix.security }}" + ctest-args: "-LE xfail" + fastdds_branch: '2.6.x' From 7f593bafcccc1b8faecde2fafa6f85ac5079737a Mon Sep 17 00:00:00 2001 From: Mario Dominguez Date: Wed, 3 Jul 2024 09:41:15 +0200 Subject: [PATCH 3/3] Refs #21244: Apply Jesus suggestion Signed-off-by: Mario Dominguez --- .github/workflows/weekly-ubuntu-ci.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/weekly-ubuntu-ci.yml b/.github/workflows/weekly-ubuntu-ci.yml index e9593447cdd..808bcbc8d44 100644 --- a/.github/workflows/weekly-ubuntu-ci.yml +++ b/.github/workflows/weekly-ubuntu-ci.yml @@ -11,15 +11,13 @@ jobs: strategy: fail-fast: false matrix: - os-image: - - 'ubuntu-22.04' security: - true - false uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@2.6.x with: - os-image: ${{ matrix.os-image }} - label: '${{ matrix.os-image }}-weekly-sec-${{ matrix.security }}-ubuntu-ci-2.6.x' + os-image: 'ubuntu-20.04' + label: 'weekly-sec-${{ matrix.security }}-ubuntu-ci-2.6.x' ctest-args: "-LE xfail" fastdds-branch: '2.6.x' security: ${{ matrix.security }}