Skip to content

Commit

Permalink
Adapt nightly jobs for all supported versions (#4549)
Browse files Browse the repository at this point in the history
* Refs #20542: Adapt nightly jobs for all supported versions

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

* Refs #20542: Simplify workflows

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

* Refs #20542: Update json metas to yaml

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: Address missing suggestion

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

* Refs #20542: Apply rev suggestions (2)

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

* Refs #20542: Remove coverage.repos file

Signed-off-by: EduPonz <eduardoponz@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 3557063 commit 276581e
Show file tree
Hide file tree
Showing 22 changed files with 83 additions and 341 deletions.
48 changes: 18 additions & 30 deletions .github/workflows/config/asan_colcon.meta
Original file line number Diff line number Diff line change
@@ -1,31 +1,19 @@
{
"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'"
]
},
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",
]
}
}
}
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.13.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.

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.13.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.

49 changes: 18 additions & 31 deletions .github/workflows/config/tsan_colcon.meta
Original file line number Diff line number Diff line change
@@ -1,31 +1,18 @@
{
"names":
{
"fastcdr":
{
"cmake-args":
[
"-DCMAKE_C_FLAGS='-fsanitize=thread -O2 -g -fno-omit-frame-pointer'",
"-DCMAKE_CXX_FLAGS='-fsanitize=thread -O2 -g -fno-omit-frame-pointer'"
]
},
"fastrtps":
{
"cmake-args":
[
"-DCOMPILE_EXAMPLES=OFF",
"-DEPROSIMA_BUILD_TESTS=ON",
"-DRTPS_API_TESTS=ON",
"-DFASTRTPS_API_TESTS=OFF",
"-DFASTDDS_PIM_API_TESTS=ON",
"-DPERFORMANCE_TESTS=ON",
"-DNO_TLS=OFF",
"-DSECURITY=ON",
"-DFASTDDS_STATISTICS=ON",
"-DCMAKE_C_FLAGS='-fsanitize=thread -O2 -g -fno-omit-frame-pointer'",
"-DCMAKE_CXX_FLAGS='-fsanitize=thread -O2 -g -fno-omit-frame-pointer'"
]
}

}
}
names:
fastcdr:
cmake-args:
- "-DCMAKE_C_FLAGS='-fsanitize=thread -O2 -g -fno-omit-frame-pointer'"
- "-DCMAKE_CXX_FLAGS='-fsanitize=thread -O2 -g -fno-omit-frame-pointer'"
fastrtps:
cmake-args:
- "-DCOMPILE_EXAMPLES=OFF"
- "-DEPROSIMA_BUILD_TESTS=ON"
- "-DRTPS_API_TESTS=ON"
- "-DFASTRTPS_API_TESTS=OFF"
- "-DFASTDDS_PIM_API_TESTS=ON"
- "-DPERFORMANCE_TESTS=ON"
- "-DNO_TLS=OFF"
- "-DSECURITY=ON"
- "-DFASTDDS_STATISTICS=ON"
- "-DCMAKE_C_FLAGS='-fsanitize=thread -O2 -g -fno-omit-frame-pointer'"
- "-DCMAKE_CXX_FLAGS='-fsanitize=thread -O2 -g -fno-omit-frame-pointer'"
2 changes: 1 addition & 1 deletion .github/workflows/mac-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@ jobs:
with:
label: ${{ inputs.label || 'mac-ci' }}
colcon-args: ${{ inputs.colcon-args }}
cmake-args: ${{ inputs.cmake-args }}
cmake-args: '-DSECURITY=ON ${{ inputs.cmake-args }}'
ctest-args: ${{ inputs.ctest-args }}
fastdds-branch: ${{ inputs.fastdds_branch || github.ref || 'master' }}
45 changes: 13 additions & 32 deletions .github/workflows/reusable-mac-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,38 +82,19 @@ jobs:
# TODO(eduponz): Set up libp11 and SoftHSM. NOTE: using SoftHSM requires adding the runner to a group,
# which entails logout/login or rebooting the machine. This is not feasible in a CI environment.

- name: Prepare colcon workspace
id: colcon_ws_setup
run: |
# Nightly job
if [[ "${{ inputs.label }}" == *"nightly"* ]]
then
DEPENDS_REPOS_PATH="./src/fastrtps/.github/workflows/config/nightly_${{ inputs.fastdds-branch }}.repos"
if [ ! -f ${DEPENDS_REPOS_PATH} ]
then
DEPENDS_REPOS_PATH="./src/fastrtps/.github/workflows/config/nightly_master.repos"
fi
META_PATH="./src/fastrtps/.github/workflows/config/nightly.meta"
# Either PR or manual
else
DEPENDS_REPOS_PATH="./src/fastrtps/.github/workflows/config/default_ci_${{ inputs.fastdds-branch }}.repos"
if [ ! -f ${DEPENDS_REPOS_PATH} ]
then
DEPENDS_REPOS_PATH="./src/fastrtps/.github/workflows/config/default_ci_master.repos"
fi
META_PATH="./src/fastrtps/.github/workflows/config/default_ci.meta"
fi
echo "Selected repos files: ${DEPENDS_REPOS_PATH}"
cat ${DEPENDS_REPOS_PATH}
echo "Selected metas files: ${META_PATH}"
cp ${META_PATH} ci.meta
cat ci.meta
- name: Fetch Fast DDS dependencies
uses: eProsima/eProsima-CI/multiplatform/vcs_import@v0
with:
vcs_repos_file: ${{ github.workspace }}/src/fastrtps/fastrtps.repos
destination_workspace: src
skip_existing: 'true'

# Create source dir and download the sources
vcs import src --input ${DEPENDS_REPOS_PATH} --skip-existing
- name: Fetch Fast DDS CI dependencies
uses: eProsima/eProsima-CI/multiplatform/vcs_import@v0
with:
vcs_repos_file: ${{ github.workspace }}/src/fastrtps/.github/workflows/config/ci.repos
destination_workspace: src
skip_existing: 'true'

# TODO(eduponz): There is a warning in clang >= 16 regarding enum-constexpr-conversion:
# - Issue: https://github.com/boostorg/mpl/issues/69.
Expand All @@ -123,7 +104,7 @@ jobs:
continue-on-error: false
uses: eProsima/eProsima-CI/multiplatform/colcon_build@v0
with:
colcon_meta_file: ${{ github.workspace }}/ci.meta
colcon_meta_file: ${{ github.workspace }}/src/fastrtps/.github/workflows/config/ci.meta
colcon_build_args: ${{ inputs.colcon-args }}
cmake_args: ${{ inputs.cmake-args }}
cmake_args_default: -DCMAKE_CXX_FLAGS="-Werror -Wall -Wno-enum-constexpr-conversion"
Expand Down
Loading

0 comments on commit 276581e

Please sign in to comment.