Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[20542] Improve CI version management #4480

Merged
merged 9 commits into from
Mar 6, 2024
52 changes: 0 additions & 52 deletions .github/actions/fetch-fastdds-repos/action.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Sanitizer analysis
name: Address Sanitizer analysis

on:
workflow_dispatch:
Expand All @@ -11,10 +11,15 @@ on:
description: 'Branch or tag of Fast DDS repository (https://github.com/eProsima/Fast-DDS)'
required: true
default: 'master'

pull_request:
push:
branches:
- master
- 'master'
paths-ignore:
- '**.md'
- '**.txt'
- '!**/CMakeLists.txt'

schedule:
- cron: '0 1 * * *'

Expand Down
8 changes: 0 additions & 8 deletions .github/workflows/documentation-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,6 @@ on:
type: string
default: 'master'

push:
branches:
- 'master'
paths-ignore:
- '**.md'
- '**.txt'
- '!**/CMakeLists.txt'

pull_request:
branches:
- 'master'
Expand Down
11 changes: 1 addition & 10 deletions .github/workflows/mac-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,9 @@ on:
type: string
required: true

push:
pull_request:
branches:
- 'master'
- '2.13.x'
- '2.12.x'
- '2.10.x'
- '2.6.x'
paths-ignore:
- '**.md'
- '**.txt'
- '!**/CMakeLists.txt'
pull_request:
paths-ignore:
- '**.md'
- '**.txt'
Expand Down
24 changes: 20 additions & 4 deletions .github/workflows/nightly-mac-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,33 @@ on:

jobs:
nightly-sec-mac-ci:
strategy:
matrix:
fastdds-branch:
- 'master'
- '2.13.x'
- '2.12.x'
- '2.10.x'
- '2.6.x'
uses: ./.github/workflows/reusable-mac-ci.yml
with:
label: 'nightly-sec-mac-ci'
label: 'nightly-sec-mac-ci-${{ matrix.fastdds-branch }}'
cmake-args: "-DSECURITY=ON"
ctest-args: "-LE xfail"
fastdds-branch: 'master'
fastdds-branch: '${{ matrix.fastdds-branch }}'
elianalf marked this conversation as resolved.
Show resolved Hide resolved

nightly-nosec-mac-ci:
strategy:
matrix:
fastdds-branch:
- 'master'
- '2.13.x'
- '2.12.x'
- '2.10.x'
- '2.6.x'
uses: ./.github/workflows/reusable-mac-ci.yml
with:
label: 'nightly-nosec-mac-ci'
label: 'nightly-nosec-mac-ci-${{ matrix.fastdds-branch }}'
cmake-args: "-DSECURITY=OFF"
ctest-args: "-LE xfail"
fastdds-branch: 'master'
fastdds-branch: '${{ matrix.fastdds-branch }}'
elianalf marked this conversation as resolved.
Show resolved Hide resolved
10 changes: 8 additions & 2 deletions .github/workflows/nightly-ubuntu-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,17 @@ jobs:
matrix:
os-image:
- 'ubuntu-22.04'
fastdds-branch:
- 'master'
- '2.13.x'
- '2.12.x'
- '2.10.x'
- '2.6.x'

uses: ./.github/workflows/reusable-ubuntu-ci.yml
with:
os-image: ${{ matrix.os-image }}
label: '${{ matrix.os-image }}-nightly-sec-ubuntu-ci'
label: '${{ matrix.os-image }}-nightly-sec-ubuntu-ci-${{ matrix.fastdds-branch }}'
cmake-args: "-DSECURITY=ON"
ctest-args: "-LE xfail"
fastdds-branch: 'master'
fastdds-branch: '${{ matrix.fastdds-branch }}'
elianalf marked this conversation as resolved.
Show resolved Hide resolved
24 changes: 20 additions & 4 deletions .github/workflows/nightly-windows-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,36 @@ on:

jobs:
nightly-sec-windows-ci:
strategy:
matrix:
fastdds-branch:
- 'master'
- '2.13.x'
- '2.12.x'
- '2.10.x'
- '2.6.x'
uses: ./.github/workflows/reusable-windows-ci.yml
with:
label: 'nightly-sec-windows-ci'
label: 'nightly-sec-windows-ci-${{ matrix.fastdds-branch }}'
cmake-args: "-DSECURITY=ON"
ctest-args: "-LE xfail"
fastdds_branch: 'master'
fastdds_branch: '${{ matrix.fastdds-branch }}'
elianalf marked this conversation as resolved.
Show resolved Hide resolved

nightly-nosec-windows-ci:
strategy:
matrix:
fastdds-branch:
- 'master'
- '2.13.x'
- '2.12.x'
- '2.10.x'
- '2.6.x'
uses: ./.github/workflows/reusable-windows-ci.yml
with:
label: 'nightly-nosec-windows-ci'
label: 'nightly-nosec-windows-ci-${{ matrix.fastdds-branch }}'
cmake-args: "-DSECURITY=OFF"
ctest-args: "-LE xfail"
fastdds_branch: 'master'
fastdds_branch: '${{ matrix.fastdds-branch }}'
elianalf marked this conversation as resolved.
Show resolved Hide resolved

nightly-3_0_x-windows-ci:
uses: ./.github/workflows/reusable-windows-ci.yml
Expand Down
10 changes: 0 additions & 10 deletions .github/workflows/reusable-windows-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -189,13 +189,3 @@ jobs:
show_failed: 'True'
show_disabled: 'False'
show_skipped: 'False'

- name: Test Report
uses: eProsima/eProsima-CI/external/test-reporter@main
if: ${{ !cancelled() && !contains(github.event.pull_request.labels.*.name, 'no-test') }}
with:
name: "Report: ${{ matrix.cmake-config }} | ${{ matrix.vs-toolset }} "
path: "${{ steps.test.outputs.ctest_results_path }}*.xml"
working-directory: 'src/fastrtps'
path-replace-backslashes: 'true'
list-tests: 'failed'
11 changes: 3 additions & 8 deletions .github/workflows/thread-sanitizer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,6 @@ on:
required: false
type: string

push:
branches:
- 'master'
paths-ignore:
- '**.md'
- '**.txt'
- '!**/CMakeLists.txt'

pull_request:
branches:
- 'master'
Expand All @@ -31,6 +23,9 @@ on:
- '**.txt'
- '!**/CMakeLists.txt'

schedule:
- cron: '0 1 * * *'

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true
Expand Down
47 changes: 47 additions & 0 deletions .github/workflows/ubuntu-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: Fast-DDS Ubuntu CI

on:
workflow_dispatch:
inputs:
label:
description: 'ID associated to the workflow'
required: true
type: string
colcon-args:
description: 'Extra arguments for colcon cli'
required: false
type: string
cmake-args:
description: 'Extra arguments for cmake cli'
required: false
type: string
ctest-args:
description: 'Extra arguments for ctest cli'
required: false
type: string
fastdds_branch:
description: 'Branch or tag of Fast DDS repository (https://github.com/eProsima/Fast-DDS)'
type: string
required: true

elianalf marked this conversation as resolved.
Show resolved Hide resolved
concurrency:
group: ${{ github.workflow }}
cancel-in-progress: true

jobs:
ubuntu-ci:

strategy:
fail-fast: false
matrix:
os-image:
- 'ubuntu-22.04'

uses: ./.github/workflows/reusable-ubuntu-ci.yml
with:
os-image: ${{ matrix.os-image }}
label: ${{ inputs.label || 'ubuntu-ci' }}
colcon-args: ${{ inputs.colcon-args }}
cmake-args: ${{ inputs.cmake-args || "-DSECURITY=ON" }}
ctest-args: ${{ inputs.ctest-args || "-LE xfail" }}
fastdds-branch: ${{ inputs.fastdds_branch || github.ref || 'master' }}
11 changes: 1 addition & 10 deletions .github/workflows/windows-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,9 @@ on:
type: string
required: true

push:
pull_request:
branches:
- 'master'
- '2.13.x'
- '2.12.x'
- '2.10.x'
- '2.6.x'
paths-ignore:
- '**.md'
- '**.txt'
- '!**/CMakeLists.txt'
pull_request:
paths-ignore:
- '**.md'
- '**.txt'
Expand Down