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

[20705] Fix CI after rebase #4683

Closed
wants to merge 14 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 1 addition & 2 deletions .github/workflows/config/asan_colcon.meta
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
names:
fastrtps:
fastdds:
cmake-args:
- "-DNO_TLS=OFF"
- "-DSECURITY=ON"
Expand All @@ -14,4 +14,3 @@ names:
- "-Dgtest_force_shared_crt=ON"
- "-DBUILD_SHARED_LIBS=ON"
- "-DBUILD_GMOCK=ON"

5 changes: 2 additions & 3 deletions .github/workflows/config/ci.meta
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
names:
fastrtps:
fastdds:
cmake-args:
- "-DBUILD_DOCUMENTATION=OFF"
- "-DBUILD_SHARED_LIBS=ON"
Expand All @@ -8,7 +8,6 @@ names:
- "-DFASTDDS_ENFORCE_LOG_INFO=ON"
- "-DFASTDDS_PIM_API_TESTS=ON"
- "-DFASTDDS_STATISTICS=ON"
- "-DFASTRTPS_API_TESTS=OFF"
- "-DINSTALL_EXAMPLES=ON"
- "-DINSTALL_TOOLS=ON"
- "-DINTERNAL_DEBUG=ON"
Expand All @@ -19,7 +18,7 @@ names:
- "-DSTRICT_REALTIME=OFF"
- "-DSYSTEM_TESTS=ON"
- "-DMEMORYCHECK_COMMAND_OPTIONS=-q --tool=memcheck --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=2 --error-exitcode=1"
- "-DMEMORYCHECK_SUPPRESSIONS_FILE=../../src/fastrtps/valgrind.supp"
- "-DMEMORYCHECK_SUPPRESSIONS_FILE=../../src/fastdds/valgrind.supp"
googletest-distribution:
cmake-args:
- "-Dgtest_force_shared_crt=ON"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/config/documentation.meta
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
names:
fastrtps:
fastdds:
cmake-args:
- "-DBUILD_SHARED_LIBS=ON"
- "-DSECURITY=ON"
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/config/tsan_colcon.meta
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@ names:
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:
fastdds:
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"
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/documentation-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
- name: Sync eProsima/Fast-DDS repository
uses: eProsima/eProsima-CI/external/checkout@v0
with:
path: src/fastrtps
path: src/fastdds
submodules: true

- name: Get minimum supported version of CMake
Expand Down Expand Up @@ -74,14 +74,14 @@ jobs:
- name: Download Fast DDS .repos
uses: eProsima/eProsima-CI/ubuntu/vcs_import@v0
with:
vcs_repos_file: ./src/fastrtps/fastrtps.repos
vcs_repos_file: ./src/fastdds/fastdds.repos
destination_workspace: src
skip_existing: 'true'

- 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
vcs_repos_file: ${{ github.workspace }}/src/fastdds/.github/workflows/config/ci.repos
destination_workspace: src
skip_existing: 'true'

Expand Down Expand Up @@ -123,7 +123,7 @@ jobs:
continue-on-error: false
uses: eProsima/eProsima-CI/multiplatform/colcon_build@v0
with:
colcon_meta_file: './src/fastrtps/.github/workflows/config/documentation.meta'
colcon_meta_file: './src/fastdds/.github/workflows/config/documentation.meta'
colcon_build_args: ''
colcon_build_args_default: ''
cmake_args: ''
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/mac-ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Fast-DDS MacOS CI
name: Fast DDS MacOS CI

on:
workflow_dispatch:
Expand Down Expand Up @@ -48,4 +48,4 @@ jobs:
colcon-args: ${{ inputs.colcon-args }}
cmake-args: '-DSECURITY=ON ${{ inputs.cmake-args }}'
ctest-args: ${{ inputs.ctest-args }}
fastdds-branch: ${{ inputs.fastdds_branch || github.ref || 'master' }}
fastdds-branch: ${{ inputs.fastdds_branch || github.ref || '3.0.x-devel' }}
2 changes: 1 addition & 1 deletion .github/workflows/mirror.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
fail-fast: false
matrix:
dest_branch:
- '2.14.x'
- '3.0.x'
steps:
- name: Mirror action step
id: mirror
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly-mac-ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Fast-DDS MacOS CI (nightly)
name: Fast DDS MacOS CI (nightly)

on:
workflow_dispatch:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly-ubuntu-ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Fast-DDS Ubuntu CI (nightly)
name: Fast DDS Ubuntu CI (nightly)

on:
workflow_dispatch:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly-windows-ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Fast-DDS Windows CI (nightly)
name: Fast DDS Windows CI (nightly)

on:
workflow_dispatch:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/reusable-mac-ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Fast-DDS MacOS CI reusable workflow
name: Fast DDS MacOS CI reusable workflow

on:
workflow_call:
Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
- name: Sync eProsima/Fast-DDS repository
uses: eProsima/eProsima-CI/external/checkout@v0
with:
path: src/fastrtps
path: src/fastdds
ref: ${{ inputs.fastdds-branch }}

- uses: eProsima/eProsima-CI/external/setup-python@v0
Expand Down Expand Up @@ -93,14 +93,14 @@ jobs:
- name: Fetch Fast DDS dependencies
uses: eProsima/eProsima-CI/multiplatform/vcs_import@v0
with:
vcs_repos_file: ${{ github.workspace }}/src/fastrtps/fastrtps.repos
vcs_repos_file: ${{ github.workspace }}/src/fastdds/fastdds.repos
destination_workspace: src
skip_existing: 'true'

- 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
vcs_repos_file: ${{ github.workspace }}/src/fastdds/.github/workflows/config/ci.repos
destination_workspace: src
skip_existing: 'true'

Expand All @@ -112,7 +112,7 @@ jobs:
continue-on-error: false
uses: eProsima/eProsima-CI/multiplatform/colcon_build@v0
with:
colcon_meta_file: ${{ github.workspace }}/src/fastrtps/.github/workflows/config/ci.meta
colcon_meta_file: ${{ github.workspace }}/src/fastdds/.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 All @@ -128,7 +128,7 @@ jobs:
colcon_test_args_default: --event-handlers=console_direct+
ctest_args: ${{ inputs.ctest-args }}
ctest_args_default: --repeat until-pass:3 --timeout 300 --label-exclude "xfail"
packages_names: fastrtps
packages_names: fastdds
workspace: ${{ github.workspace }}
test_report_artifact: ${{ format('test_report_{0}_{1}_{2}', inputs.label, github.job, join(matrix.*, '_')) }}

Expand Down
48 changes: 24 additions & 24 deletions .github/workflows/reusable-sanitizers-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
- name: Sync eProsima/Fast-DDS repository
uses: eProsima/eProsima-CI/external/checkout@v0
with:
path: src/fastrtps
path: src/fastdds
ref: ${{ inputs.fastdds_ref }}

- name: Get minimum supported version of CMake
Expand All @@ -98,27 +98,27 @@ jobs:
- name: Fetch Fast DDS dependencies
uses: eProsima/eProsima-CI/multiplatform/vcs_import@v0
with:
vcs_repos_file: ${{ github.workspace }}/src/fastrtps/fastrtps.repos
vcs_repos_file: ${{ github.workspace }}/src/fastdds/fastdds.repos
destination_workspace: src
skip_existing: 'true'

- 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/asan.repos
vcs_repos_file: ${{ github.workspace }}/src/fastdds/.github/workflows/config/asan.repos
destination_workspace: src
skip_existing: 'true'

- name: Show .meta file
id: show_meta
run: |
cat ${{ github.workspace }}/src/fastrtps/.github/workflows/config/asan_colcon.meta
cat ${{ github.workspace }}/src/fastdds/.github/workflows/config/asan_colcon.meta

- name: Colcon build
continue-on-error: false
uses: eProsima/eProsima-CI/multiplatform/colcon_build@v0
with:
colcon_meta_file: ${{ github.workspace }}/src/fastrtps/.github/workflows/config/asan_colcon.meta
colcon_meta_file: ${{ github.workspace }}/src/fastdds/.github/workflows/config/asan_colcon.meta
colcon_build_args: ${{ inputs.colcon_build_args }}
cmake_args: ${{ inputs.cmake_args }}
cmake_args_default: ''
Expand Down Expand Up @@ -166,16 +166,16 @@ jobs:
- name: Show .meta file
id: show_meta
run: |
cat ${{ github.workspace }}/src/fastrtps/.github/workflows/config/asan_colcon.meta
cat ${{ github.workspace }}/src/fastdds/.github/workflows/config/asan_colcon.meta

- name: Colcon build
continue-on-error: false
uses: eProsima/eProsima-CI/multiplatform/colcon_build@v0
with:
colcon_meta_file: ${{ github.workspace }}/src/fastrtps/.github/workflows/config/asan_colcon.meta
colcon_meta_file: ${{ github.workspace }}/src/fastdds/.github/workflows/config/asan_colcon.meta
colcon_build_args: ${{ inputs.colcon_build_args }}
cmake_args: ${{ inputs.cmake_args }}
cmake_args_default: -DEPROSIMA_BUILD_TESTS=ON -DRTPS_API_TESTS=ON -DFASTRTPS_API_TESTS=ON -DFASTDDS_PIM_API_TESTS=ON -DPERFORMANCE_TESTS=ON
cmake_args_default: -DEPROSIMA_BUILD_TESTS=ON -DRTPS_API_TESTS=ON -DFASTDDS_API_TESTS=ON -DFASTDDS_PIM_API_TESTS=ON -DPERFORMANCE_TESTS=ON
cmake_build_type: 'Debug'
workspace: ${{ github.workspace }}
workspace_dependencies: ''
Expand All @@ -190,21 +190,21 @@ jobs:
colcon_test_args_default: '--event-handlers=console_direct+ --return-code-on-test-failure'
ctest_args: ${{ inputs.ctest_args }}
ctest_args_default: '--timeout 300 --label-exclude "xfail"'
packages_names: fastrtps
packages_names: fastdds
workspace: ${{ github.workspace }}
workspace_dependencies: ''
test_report_artifact: ${{ format('test_report_{0}_{1}', inputs.label, github.job) }}

- name: Report sanitizer errors
if: ${{ inputs.run_asan_fastdds }}
run: |
bash src/fastrtps/.github/workflows/utils/specific_errors_filter.sh \
bash src/fastdds/.github/workflows/utils/specific_errors_filter.sh \
"==ERROR:" \
log/latest_test/fastrtps/stdout_stderr.log \
log/latest_test/fastdds/stdout_stderr.log \
_tmp_specific_error_file.log

python3 src/fastrtps/.github/workflows/utils/log_parser.py \
--log-file log/latest_test/fastrtps/stdout_stderr.log \
python3 src/fastdds/.github/workflows/utils/log_parser.py \
--log-file log/latest_test/fastdds/stdout_stderr.log \
--specific-error-file _tmp_specific_error_file.log \
--output-file $GITHUB_STEP_SUMMARY \
--sanitizer asan
Expand Down Expand Up @@ -263,13 +263,13 @@ jobs:
- name: Show .meta file
id: show_meta
run: |
cat ${{ github.workspace }}/src/fastrtps/.github/workflows/config/asan_colcon.meta
cat ${{ github.workspace }}/src/fastdds/.github/workflows/config/asan_colcon.meta

- name: Colcon build
continue-on-error: false
uses: eProsima/eProsima-CI/multiplatform/colcon_build@v0
with:
colcon_meta_file: ${{ github.workspace }}/src/fastrtps/.github/workflows/config/asan_colcon.meta
colcon_meta_file: ${{ github.workspace }}/src/fastdds/.github/workflows/config/asan_colcon.meta
colcon_build_args: ${{ inputs.colcon_build_args }}
cmake_args: ${{ inputs.cmake_args }}
cmake_args_default: ''
Expand All @@ -295,12 +295,12 @@ jobs:
- name: Report sanitizer errors
if: ${{ inputs.run_asan_discovery_server }}
run: |
bash src/fastrtps/.github/workflows/utils/specific_errors_filter.sh \
bash src/fastdds/.github/workflows/utils/specific_errors_filter.sh \
"==ERROR:" \
log/latest_test/discovery-server/stdout_stderr.log \
_tmp_specific_error_file.log

python3 src/fastrtps/.github/workflows/utils/log_parser.py \
python3 src/fastdds/.github/workflows/utils/log_parser.py \
--log-file log/latest_test/discovery-server/stdout_stderr.log \
--specific-error-file _tmp_specific_error_file.log \
--output-file $GITHUB_STEP_SUMMARY \
Expand Down Expand Up @@ -332,7 +332,7 @@ jobs:
- name: Sync eProsima/Fast-DDS repository
uses: eProsima/eProsima-CI/external/checkout@v0
with:
path: src/fastrtps
path: src/fastdds
ref: ${{ inputs.fastdds_ref }}

- name: Get minimum supported version of CMake
Expand All @@ -359,27 +359,27 @@ jobs:
- name: Fetch Fast DDS dependencies
uses: eProsima/eProsima-CI/multiplatform/vcs_import@v0
with:
vcs_repos_file: ${{ github.workspace }}/src/fastrtps/fastrtps.repos
vcs_repos_file: ${{ github.workspace }}/src/fastdds/fastdds.repos
destination_workspace: src
skip_existing: 'true'

- 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
vcs_repos_file: ${{ github.workspace }}/src/fastdds/.github/workflows/config/ci.repos
destination_workspace: src
skip_existing: 'true'

- name: Show .meta file
id: show_meta
run: |
cat ${{ github.workspace }}/src/fastrtps/.github/workflows/config/tsan_colcon.meta
cat ${{ github.workspace }}/src/fastdds/.github/workflows/config/tsan_colcon.meta

- name: Colcon build
continue-on-error: false
uses: eProsima/eProsima-CI/multiplatform/colcon_build@v0
with:
colcon_meta_file: ${{ github.workspace }}/src/fastrtps/.github/workflows/config/tsan_colcon.meta
colcon_meta_file: ${{ github.workspace }}/src/fastdds/.github/workflows/config/tsan_colcon.meta
colcon_build_args: ${{ inputs.colcon_build_args }}
cmake_args: ${{ inputs.cmake_args }}
cmake_args_default: ''
Expand All @@ -397,7 +397,7 @@ jobs:
colcon_test_args_default: '--event-handlers=console_direct+ --return-code-on-test-failure'
ctest_args: ${{ inputs.ctest_args }}
ctest_args_default: '--timeout 300 --label-exclude "xfail" -V -E DDSSQLFilterValueTests'
packages_names: fastrtps
packages_names: fastdds
workspace: ${{ github.workspace }}
workspace_dependencies: ''
test_report_artifact: ${{ format('test_report_{0}_{1}', inputs.label, github.job) }}
Expand All @@ -410,7 +410,7 @@ jobs:
# Create a dir for the exports
$exports = New-Item -ItemType Directory -Path ./exports
# Move to the reports dir
pushd ./log/latest_test/fastrtps
pushd ./log/latest_test/fastdds
# Install the report parser module
Find-Module -Repository PSGallery -Name SanReportParser | Install-Module -Scope CurrentUser -Force
# Parse the report files
Expand Down
Loading
Loading