Skip to content

Commit

Permalink
Fix CI version management (#4481)
Browse files Browse the repository at this point in the history
* Refs #20542: Fix CI version management

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20542: Apply internal revision suggestions

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20542: Add ignored paths to sanitizer events

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20542: Apply rev suggestions

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20542: Remove nightly files

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20542: Remove Windows CI test report

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20542: Remove unused action

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20542: Set default Discovery Server latest TAG

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20542: Address last rev suggestions

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20542: Fix input branch on reusable windows CI

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20542: Manual cherry-pick of PR #4549

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20542: Manual cherry-pick of PR #4456

Signed-off-by: EduPonz <eduardoponz@eprosima.com>

* Refs #20542: Fix a couple of nitpicks

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

---------

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
Signed-off-by: EduPonz <eduardoponz@eprosima.com>
Co-authored-by: EduPonz <eduardoponz@eprosima.com>
  • Loading branch information
JesusPoderoso and EduPonz authored Mar 14, 2024
1 parent 38f75a4 commit 0898631
Show file tree
Hide file tree
Showing 30 changed files with 197 additions and 592 deletions.
52 changes: 0 additions & 52 deletions .github/actions/fetch-fastdds-repos/action.yml

This file was deleted.

13 changes: 0 additions & 13 deletions .github/actions/install-apt-packages-documentation/action.yml

This file was deleted.

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

on:
workflow_dispatch:
inputs:
discovery_server_branch:
description: 'Branch or tag of Discovery Server repository (https://github.com/eProsima/Discovery-Server)'
required: true
default: 'master'
default: 'v1.2.2'
fastdds_branch:
description: 'Branch or tag of Fast DDS repository (https://github.com/eProsima/Fast-DDS)'
required: true
default: 'master'
default: '2.13.x'

pull_request:
push:
branches:
- master
schedule:
- cron: '0 1 * * *'
- '2.13.x'
paths-ignore:
- '**.md'
- '**.txt'
- '!**/CMakeLists.txt'

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
Expand All @@ -32,7 +34,7 @@ jobs:
runs-on: ubuntu-22.04

env:
FASTDDS_BRANCH: ${{ github.head_ref || github.event.inputs.fastdds_branch || 'master' }}
FASTDDS_BRANCH: ${{ github.head_ref || github.event.inputs.fastdds_branch || '2.13.x' }}

steps:
- name: Install apt packages
Expand Down Expand Up @@ -117,8 +119,8 @@ jobs:
runs-on: ubuntu-22.04

env:
FASTDDS_BRANCH: ${{ github.head_ref || github.event.inputs.fastdds_branch || 'master' }}
DEFAULT_DISCOVERY_SERVER_BRANCH: ${{ github.event.inputs.discovery_server_branch || 'master' }}
FASTDDS_BRANCH: ${{ github.head_ref || github.event.inputs.fastdds_branch || '2.13.x' }}
DEFAULT_DISCOVERY_SERVER_BRANCH: ${{ github.event.inputs.discovery_server_branch || 'v1.2.2' }}

steps:
- name: Install apt packages
Expand Down
49 changes: 18 additions & 31 deletions .github/workflows/config/asan_colcon.meta
Original file line number Diff line number Diff line change
@@ -1,31 +1,18 @@
{
"names":
{
"fastrtps":
{
"cmake-args":
[
"-DCMAKE_BUILD_TYPE=Debug",
"-DEPROSIMA_BUILD_TESTS=ON",
"-DRTPS_API_TESTS=ON",
"-DFASTRTPS_API_TESTS=ON",
"-DFASTDDS_PIM_API_TESTS=ON",
"-DPERFORMANCE_TESTS=ON",
"-DNO_TLS=OFF",
"-DSECURITY=ON",
"-DFASTDDS_STATISTICS=ON",
"-DSANITIZER=Address",
"-DCMAKE_CXX_FLAGS='-Werror'"
]
},

"discovery-server":
{
"cmake-args":
[
"-DCMAKE_BUILD_TYPE=Debug",
"-DSANITIZER=Address",
]
}
}
}
names:
fastrtps:
cmake-args:
- "-DCMAKE_BUILD_TYPE=Debug"
- "-DEPROSIMA_BUILD_TESTS=ON"
- "-DRTPS_API_TESTS=ON"
- "-DFASTRTPS_API_TESTS=ON"
- "-DFASTDDS_PIM_API_TESTS=ON"
- "-DPERFORMANCE_TESTS=ON"
- "-DNO_TLS=OFF"
- "-DSECURITY=ON"
- "-DFASTDDS_STATISTICS=ON"
- "-DSANITIZER=Address"
- "-DCMAKE_CXX_FLAGS='-Werror'"
discovery-server:
cmake-args:
- "-DCMAKE_BUILD_TYPE=Debug"
- "-DSANITIZER=Address"
File renamed without changes.
5 changes: 5 additions & 0 deletions .github/workflows/config/ci.repos
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
repositories:
googletest-distribution:
type: git
url: https://github.com/google/googletest.git
version: release-1.11.0
17 changes: 0 additions & 17 deletions .github/workflows/config/coverage.repos

This file was deleted.

28 changes: 0 additions & 28 deletions .github/workflows/config/default_ci.meta

This file was deleted.

13 changes: 0 additions & 13 deletions .github/workflows/config/default_ci_2.10.x.repos

This file was deleted.

13 changes: 0 additions & 13 deletions .github/workflows/config/default_ci_2.12.x.repos

This file was deleted.

13 changes: 0 additions & 13 deletions .github/workflows/config/default_ci_2.6.x.repos

This file was deleted.

13 changes: 0 additions & 13 deletions .github/workflows/config/default_ci_master.repos

This file was deleted.

17 changes: 17 additions & 0 deletions .github/workflows/config/documentation.meta
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
names:
fastrtps:
cmake-args:
- "-DBUILD_SHARED_LIBS=ON"
- "-DSECURITY=ON"
- "-DTHIRDPARTY_Asio=FORCE"
- "-DTHIRDPARTY_TinyXML2=FORCE"
- "-DTHIRDPARTY_UPDATE=OFF"
fastdds-docs:
cmake-args:
- "-DBUILD_DOCUMENTATION=ON"
- "-DCOMPILE_TESTS=ON"
googletest-distribution:
cmake-args:
- "-Dgtest_force_shared_crt=ON"
- "-DBUILD_SHARED_LIBS=ON"
- "-DBUILD_GMOCK=ON"
13 changes: 0 additions & 13 deletions .github/workflows/config/nightly_2.10.x.repos

This file was deleted.

13 changes: 0 additions & 13 deletions .github/workflows/config/nightly_2.12.x.repos

This file was deleted.

13 changes: 0 additions & 13 deletions .github/workflows/config/nightly_2.6.x.repos

This file was deleted.

13 changes: 0 additions & 13 deletions .github/workflows/config/nightly_master.repos

This file was deleted.

Loading

0 comments on commit 0898631

Please sign in to comment.