diff --git a/.github/workflows/config/fastdds_test.meta b/.github/workflows/config/fastdds_test.meta index 07b12fc1788..204cba1e4c7 100644 --- a/.github/workflows/config/fastdds_test.meta +++ b/.github/workflows/config/fastdds_test.meta @@ -1,12 +1,5 @@ names: fastdds: - cmake-args: - - "-DEPROSIMA_BUILD_TESTS=ON" - - "-DFASTDDS_PIM_API_TESTS=ON" - - "-DPERFORMANCE_TESTS=ON" - - "-DPROFILING_TESTS=OFF" - - "-DCOMPILE_TOOLS=ON" - - "-DSYSTEM_TESTS=ON" ctest-args: [ "--repeat", "until-pass:3", "--timeout", "300", diff --git a/.github/workflows/mac-ci.yml b/.github/workflows/mac-ci.yml deleted file mode 100644 index 03945a414ac..00000000000 --- a/.github/workflows/mac-ci.yml +++ /dev/null @@ -1,51 +0,0 @@ -name: Fast DDS MacOS 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 - - pull_request: - types: - - review_requested - paths-ignore: - - '**.md' - - '**.txt' - - '!**/CMakeLists.txt' - -concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} - cancel-in-progress: true - -jobs: - mac-ci: - if: ${{ ( - !contains(github.event.pull_request.labels.*.name, 'skip-ci') && - !contains(github.event.pull_request.labels.*.name, 'conflicts') - ) }} - uses: ./.github/workflows/reusable-mac-ci.yml - with: - label: ${{ inputs.label || 'mac-ci' }} - 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' }} diff --git a/.github/workflows/reusable-ubuntu-ci.yml b/.github/workflows/reusable-ubuntu-ci.yml index bb5bb5a9de6..2f1b1cdf5d8 100644 --- a/.github/workflows/reusable-ubuntu-ci.yml +++ b/.github/workflows/reusable-ubuntu-ci.yml @@ -217,7 +217,7 @@ jobs: colcon_meta_file: ${{ github.workspace }}/src/fastdds/.github/workflows/config/fastdds_test.meta colcon_test_args: ${{ inputs.colcon-args }} colcon_test_args_default: --event-handlers=console_direct+ - ctest_args: ${{ inputs.ctest-args }} + ctest_args: '${{ inputs.ctest-args }} -R example_tests.delivery_mechanisms' packages_names: fastdds workspace: ${{ github.workspace }} test_report_artifact: ${{ format('test_report_{0}_{1}_{2}', inputs.label, github.job, join(matrix.*, '_')) }} @@ -231,572 +231,3 @@ jobs: show_failed: 'True' show_disabled: 'False' show_skipped: 'False' - - fastdds_python_build: - needs: fastdds_build - runs-on: ${{ inputs.os-image }} - if: ${{ inputs.security == true }} - strategy: - fail-fast: false - matrix: - cmake-build-type: - - 'RelWithDebInfo' - steps: - - name: Download build artifacts - uses: eProsima/eProsima-CI/external/download-artifact@v0 - with: - name: fastdds_build_${{ inputs.label }} - path: ${{ github.workspace }} - - - name: Install Fix Python version - uses: eProsima/eProsima-CI/external/setup-python@v0 - with: - python-version: '3.11' - - - name: Get minimum supported version of CMake - uses: eProsima/eProsima-CI/external/get-cmake@v0 - with: - cmakeVersion: '3.22.6' - - - name: Install apt packages - uses: eProsima/eProsima-CI/ubuntu/install_apt_packages@v0 - with: - packages: libasio-dev libtinyxml2-dev libssl-dev swig - - - name: Install colcon - uses: eProsima/eProsima-CI/ubuntu/install_colcon@v0 - - - name: Install Python dependencies - uses: eProsima/eProsima-CI/ubuntu/install_python_packages@v0 - with: - packages: xmlschema - - - name: Setup CCache - uses: eProsima/eProsima-CI/external/setup-ccache-action@v0 - if: ${{ inputs.use-ccache == true }} - with: - api_token: ${{ secrets.GITHUB_TOKEN }} - - - name: Get Fast DDS Python branch - id: get_fastdds_python_branch - uses: eProsima/eProsima-CI/ubuntu/get_related_branch_from_repo@v0 - with: - remote_repository: eProsima/Fast-DDS-python - fallback_branch: main - - - name: Download Fast DDS Python repo - uses: eProsima/eProsima-CI/external/checkout@v0 - with: - repository: eProsima/Fast-DDS-python - path: src/fastdds-python - ref: ${{ steps.get_fastdds_python_branch.outputs.deduced_branch }} - - - name: Colcon build - continue-on-error: false - uses: eProsima/eProsima-CI/multiplatform/colcon_build@v0 - with: - colcon_meta_file: ${{ github.workspace }}/src/fastdds/.github/workflows/config/fastdds_build.meta - colcon_build_args: ${{ inputs.colcon-args }} - cmake_args: '${{ env.security-cmake-flag }} ${{ inputs.cmake-args }}' - cmake_args_default: '' - cmake_build_type: ${{ matrix.cmake-build-type }} - workspace: ${{ github.workspace }} - - - name: Upload python build artifacts - uses: eProsima/eProsima-CI/external/upload-artifact@v0 - with: - name: fastdds_python_build_${{ inputs.label }} - path: ${{ github.workspace }} - - fastdds_python_test: - needs: fastdds_python_build - runs-on: ${{ inputs.os-image }} - if: ${{ inputs.security == true && inputs.run-tests == true }} - strategy: - fail-fast: false - matrix: - cmake-build-type: - - 'RelWithDebInfo' - steps: - - name: Download python build artifacts - uses: eProsima/eProsima-CI/external/download-artifact@v0 - with: - name: fastdds_python_build_${{ inputs.label }} - path: ${{ github.workspace }} - - - name: Install Fix Python version - uses: eProsima/eProsima-CI/external/setup-python@v0 - with: - python-version: '3.11' - - - name: Get minimum supported version of CMake - uses: eProsima/eProsima-CI/external/get-cmake@v0 - with: - cmakeVersion: '3.22.6' - - - name: Install apt packages - uses: eProsima/eProsima-CI/ubuntu/install_apt_packages@v0 - with: - packages: libasio-dev libtinyxml2-dev libssl-dev swig - - - name: Install colcon - uses: eProsima/eProsima-CI/ubuntu/install_colcon@v0 - - - name: Install Python dependencies - uses: eProsima/eProsima-CI/ubuntu/install_python_packages@v0 - with: - packages: vcstool xmlschema - - - name: Fetch Fast DDS CI dependencies - uses: eProsima/eProsima-CI/multiplatform/vcs_import@v0 - with: - vcs_repos_file: ${{ github.workspace }}/src/fastdds/.github/workflows/config/fastdds_test.repos - destination_workspace: src - skip_existing: 'true' - - - name: Setup CCache - uses: eProsima/eProsima-CI/external/setup-ccache-action@v0 - if: ${{ inputs.use-ccache == true }} - with: - api_token: ${{ secrets.GITHUB_TOKEN }} - - - name: Colcon build - continue-on-error: false - uses: eProsima/eProsima-CI/multiplatform/colcon_build@v0 - with: - colcon_meta_file: ${{ github.workspace }}/src/fastdds/.github/workflows/config/fastdds_build.meta ${{ github.workspace }}/src/fastdds/.github/workflows/config/python_test.meta - colcon_build_args: ${{ inputs.colcon-args }} - cmake_args: '${{ env.security-cmake-flag }} ${{ inputs.cmake-args }}' - cmake_args_default: '' - cmake_build_type: ${{ matrix.cmake-build-type }} - workspace: ${{ github.workspace }} - - - name: Colcon test - id: python_test - uses: eProsima/eProsima-CI/multiplatform/colcon_test@v0 - with: - colcon_meta_file: ${{ github.workspace }}/src/fastdds/.github/workflows/config/python_test.meta - colcon_test_args: ${{ inputs.colcon-args }} - colcon_test_args_default: --event-handlers=console_direct+ - ctest_args: ${{ inputs.ctest-args }} - packages_names: fastdds_python - workspace: ${{ github.workspace }} - workspace_dependencies: '' - test_report_artifact: ${{ format('test_report_{0}_{1}_{2}', inputs.label, github.job, join(matrix.*, '_')) }} - - - name: Fast DDS Python test summary - uses: eProsima/eProsima-CI/multiplatform/junit_summary@v0 - if: ${{ !cancelled() }} - with: - junit_reports_dir: "${{ steps.python_test.outputs.ctest_results_path }}" - print_summary: 'True' - show_failed: 'True' - show_disabled: 'False' - show_skipped: 'False' - - fastdds_docs_test: - needs: fastdds_python_build - runs-on: ${{ inputs.os-image }} - if: ${{ inputs.security == true }} - strategy: - fail-fast: false - matrix: - cmake-build-type: - - 'RelWithDebInfo' - steps: - - name: Download python build artifacts - uses: eProsima/eProsima-CI/external/download-artifact@v0 - with: - name: fastdds_python_build_${{ inputs.label }} - path: ${{ github.workspace }} - - - name: Install Fix Python version - uses: eProsima/eProsima-CI/external/setup-python@v0 - with: - python-version: '3.11' - - - name: Get minimum supported version of CMake - uses: eProsima/eProsima-CI/external/get-cmake@v0 - with: - cmakeVersion: '3.22.6' - - - name: Install apt packages - uses: eProsima/eProsima-CI/ubuntu/install_apt_packages@v0 - with: - packages: libasio-dev libtinyxml2-dev libssl-dev swig doxygen imagemagick plantuml - - - name: Install colcon - uses: eProsima/eProsima-CI/ubuntu/install_colcon@v0 - - - name: Install Python dependencies - uses: eProsima/eProsima-CI/ubuntu/install_python_packages@v0 - with: - packages: vcstool xmlschema - - - name: Setup CCache - uses: eProsima/eProsima-CI/external/setup-ccache-action@v0 - if: ${{ inputs.use-ccache == true }} - with: - api_token: ${{ secrets.GITHUB_TOKEN }} - - - name: Get Fast DDS Docs branch - id: get_fastdds_docs_branch - uses: eProsima/eProsima-CI/ubuntu/get_related_branch_from_repo@v0 - with: - remote_repository: eProsima/Fast-DDS-docs - fallback_branch: master - - - name: Download Fast DDS documentation repo - uses: eProsima/eProsima-CI/external/checkout@v0 - with: - repository: eProsima/Fast-DDS-docs - path: src/fastdds-docs - ref: ${{ steps.get_fastdds_docs_branch.outputs.deduced_branch }} - - - name: Fetch Fast DDS CI dependencies - if: ${{ inputs.run-tests == true }} - uses: eProsima/eProsima-CI/multiplatform/vcs_import@v0 - with: - vcs_repos_file: ${{ github.workspace }}/src/fastdds/.github/workflows/config/fastdds_test.repos - destination_workspace: src - skip_existing: 'true' - - - name: Install Fast DDS Docs required python packages - uses: eProsima/eProsima-CI/ubuntu/install_python_packages@v0 - with: - upgrade: false - requirements_file_name: src/fastdds-docs/docs/requirements.txt - - - name: Colcon build - continue-on-error: false - uses: eProsima/eProsima-CI/multiplatform/colcon_build@v0 - with: - colcon_meta_file: ${{ github.workspace }}/src/fastdds/.github/workflows/config/fastdds_build.meta ${{ github.workspace }}/src/fastdds/.github/workflows/config/documentation.meta - colcon_build_args: ${{ inputs.colcon-args }} - cmake_args: '${{ env.security-cmake-flag }} ${{ inputs.cmake-args }}' - cmake_build_type: ${{ matrix.cmake-build-type }} - workspace: ${{ github.workspace }} - - - name: Colcon test - id: docs_test - if: ${{ inputs.run-tests == true }} - uses: eProsima/eProsima-CI/multiplatform/colcon_test@v0 - with: - colcon_meta_file: ${{ github.workspace }}/src/fastdds/.github/workflows/config/documentation.meta - colcon_test_args: ${{ inputs.colcon-args }} - colcon_test_args_default: --event-handlers=console_direct+ - ctest_args: ${{ inputs.ctest-args }} - packages_names: fastdds-docs - workspace: ${{ github.workspace }} - workspace_dependencies: '' - test_report_artifact: ${{ format('test_report_{0}_{1}_{2}', inputs.label, github.job, join(matrix.*, '_')) }} - - - name: Fast DDS Docs test summary - uses: eProsima/eProsima-CI/multiplatform/junit_summary@v0 - if: ${{ !cancelled() && inputs.run-tests == true }} - with: - junit_reports_dir: "${{ steps.docs_test.outputs.ctest_results_path }}" - print_summary: 'True' - show_failed: 'True' - show_disabled: 'False' - show_skipped: 'False' - - fastdds_shapesdemo_build: - needs: fastdds_build - runs-on: ${{ inputs.os-image }} - strategy: - fail-fast: false - matrix: - cmake-build-type: - - 'RelWithDebInfo' - steps: - - name: Download build artifacts - uses: eProsima/eProsima-CI/external/download-artifact@v0 - with: - name: fastdds_build_${{ inputs.label }} - path: ${{ github.workspace }} - - - name: Install Fix Python version - uses: eProsima/eProsima-CI/external/setup-python@v0 - with: - python-version: '3.11' - - - name: Get minimum supported version of CMake - uses: eProsima/eProsima-CI/external/get-cmake@v0 - with: - cmakeVersion: '3.22.6' - - - name: Install apt packages - uses: eProsima/eProsima-CI/ubuntu/install_apt_packages@v0 - with: - packages: libasio-dev libtinyxml2-dev libssl-dev - - - name: Install colcon - uses: eProsima/eProsima-CI/ubuntu/install_colcon@v0 - - - name: Install Python dependencies - uses: eProsima/eProsima-CI/ubuntu/install_python_packages@v0 - with: - packages: xmlschema - - - name: Setup CCache - uses: eProsima/eProsima-CI/external/setup-ccache-action@v0 - if: ${{ inputs.use-ccache == true }} - with: - api_token: ${{ secrets.GITHUB_TOKEN }} - - # Get Shapes Demo to make sure it keeps compiling - - name: Get Shapes Demo branch - id: get_shapes_demo_branch - uses: eProsima/eProsima-CI/ubuntu/get_related_branch_from_repo@v0 - with: - remote_repository: eProsima/ShapesDemo - fallback_branch: 'master' - - - name: Download Shapes Demo repo - uses: eProsima/eProsima-CI/external/checkout@v0 - with: - repository: eProsima/ShapesDemo - path: src/shapes-demo - ref: ${{ steps.get_shapes_demo_branch.outputs.deduced_branch }} - - # Required for Shapes Demo - # Do not setup python as it will internally modify the pythonLocation env variable - # and we want to use a fix version - - name: Install Qt - uses: jurplel/install-qt-action@v2.13.0 - with: - version: '5.15.2' - dir: '${{ github.workspace }}/qt_installation/' - modules: 'qtcharts' - setup-python: 'false' - - - name: Colcon build - continue-on-error: false - uses: eProsima/eProsima-CI/multiplatform/colcon_build@v0 - with: - colcon_meta_file: ${{ github.workspace }}/src/fastdds/.github/workflows/config/fastdds_build.meta - colcon_build_args: ${{ inputs.colcon-args }} - cmake_args: '${{ env.security-cmake-flag }} ${{ inputs.cmake-args }}' - cmake_args_default: ${{ env.colcon-build-default-cmake-args }} - cmake_build_type: ${{ matrix.cmake-build-type }} - workspace: ${{ github.workspace }} - - fastdds_discovery_server_test: - needs: fastdds_build - runs-on: ${{ inputs.os-image }} - strategy: - fail-fast: false - matrix: - cmake-build-type: - - 'RelWithDebInfo' - steps: - - name: Download build artifacts - uses: eProsima/eProsima-CI/external/download-artifact@v0 - with: - name: fastdds_build_${{ inputs.label }} - path: ${{ github.workspace }} - - - name: Install Fix Python version - uses: eProsima/eProsima-CI/external/setup-python@v0 - with: - python-version: '3.11' - - - name: Get minimum supported version of CMake - uses: eProsima/eProsima-CI/external/get-cmake@v0 - with: - cmakeVersion: '3.22.6' - - - name: Install apt packages - uses: eProsima/eProsima-CI/ubuntu/install_apt_packages@v0 - with: - packages: libasio-dev libtinyxml2-dev libssl-dev - - - name: Install colcon - uses: eProsima/eProsima-CI/ubuntu/install_colcon@v0 - - - name: Install Python dependencies - uses: eProsima/eProsima-CI/ubuntu/install_python_packages@v0 - with: - packages: vcstool xmlschema xmltodict==0.13.0 jsondiff==2.0.0 pandas==1.5.2 - - - name: Setup CCache - uses: eProsima/eProsima-CI/external/setup-ccache-action@v0 - if: ${{ inputs.use-ccache == true }} - with: - api_token: ${{ secrets.GITHUB_TOKEN }} - - - name: Get Discovery Server branch - id: get_discovery_server_branch - uses: eProsima/eProsima-CI/ubuntu/get_related_branch_from_repo@v0 - with: - remote_repository: eProsima/Discovery-Server - fallback_branch: 'master' - - - name: Download Discovery Server repo - uses: eProsima/eProsima-CI/external/checkout@v0 - with: - repository: eProsima/Discovery-Server - path: src/discovery_server - ref: ${{ steps.get_discovery_server_branch.outputs.deduced_branch }} - - - name: Fetch Fast DDS CI dependencies - uses: eProsima/eProsima-CI/multiplatform/vcs_import@v0 - with: - vcs_repos_file: ${{ github.workspace }}/src/fastdds/.github/workflows/config/fastdds_test.repos - destination_workspace: src - skip_existing: 'true' - - - name: Colcon build - continue-on-error: false - uses: eProsima/eProsima-CI/multiplatform/colcon_build@v0 - with: - colcon_meta_file: ${{ github.workspace }}/src/fastdds/.github/workflows/config/fastdds_build.meta ${{ github.workspace }}/src/fastdds/.github/workflows/config/discovery_server.meta - colcon_build_args: ${{ inputs.colcon-args }} - cmake_args: '${{ env.security-cmake-flag }} ${{ inputs.cmake-args }}' - cmake_args_default: ${{ env.colcon-build-default-cmake-args }} - cmake_build_type: ${{ matrix.cmake-build-type }} - workspace: ${{ github.workspace }} - - - name: Colcon test - id: discovery_server_test - if: ${{ inputs.run-tests == true }} - uses: eProsima/eProsima-CI/multiplatform/colcon_test@v0 - with: - colcon_meta_file: ${{ github.workspace }}/src/fastdds/.github/workflows/config/discovery_server.meta - colcon_test_args: ${{ inputs.colcon-args }} - colcon_test_args_default: --event-handlers=console_direct+ - ctest_args: ${{ inputs.ctest-args }} - packages_names: discovery-server - workspace: ${{ github.workspace }} - workspace_dependencies: '' - test_report_artifact: ${{ format('test_report_{0}_{1}_{2}', inputs.label, github.job, join(matrix.*, '_')) }} - - - name: Discovery server test summary - uses: eProsima/eProsima-CI/multiplatform/junit_summary@v0 - if: ${{ !cancelled() && inputs.run-tests == true }} - with: - junit_reports_dir: "${{ steps.discovery_server_test.outputs.ctest_results_path }}" - print_summary: 'True' - show_failed: 'True' - show_disabled: 'False' - show_skipped: 'False' - - fastdds_alternative_builds: - runs-on: ${{ inputs.os-image }} - strategy: - fail-fast: false - matrix: - cmake-build-type: - - 'RelWithDebInfo' - steps: - - name: Sync eProsima/Fast-DDS repository - uses: eProsima/eProsima-CI/external/checkout@v0 - with: - path: src/fastdds - ref: ${{ inputs.fastdds-branch }} - - - name: Install Fix Python version - uses: eProsima/eProsima-CI/external/setup-python@v0 - with: - python-version: '3.11' - - - name: Get minimum supported version of CMake - uses: eProsima/eProsima-CI/external/get-cmake@v0 - with: - cmakeVersion: '3.22.6' - - - name: Install apt dependencies - uses: eProsima/eProsima-CI/ubuntu/install_apt_packages@v0 - with: - packages: libasio-dev libtinyxml2-dev libssl-dev - update: false - upgrade: false - - - name: Install colcon - uses: eProsima/eProsima-CI/ubuntu/install_colcon@v0 - - - name: Install Python dependencies - uses: eProsima/eProsima-CI/multiplatform/install_python_packages@v0 - with: - packages: vcstool xmlschema - upgrade: false - - - name: Setup CCache - uses: eProsima/eProsima-CI/external/setup-ccache-action@v0 - if: ${{ inputs.use-ccache == true }} - with: - api_token: ${{ secrets.GITHUB_TOKEN }} - - - name: Fetch Fast DDS dependencies - uses: eProsima/eProsima-CI/multiplatform/vcs_import@v0 - with: - vcs_repos_file: ${{ github.workspace }}/src/fastdds/fastdds.repos - destination_workspace: src - skip_existing: 'true' - - - name: No security colcon build - continue-on-error: true - uses: eProsima/eProsima-CI/multiplatform/colcon_build@v0 - with: - colcon_meta_file: ${{ github.workspace }}/src/fastdds/.github/workflows/config/fastdds_build.meta - colcon_build_args: ${{ inputs.colcon-args }} - cmake_args: '-DSECURITY=OFF ${{ inputs.cmake-args }}' - cmake_args_default: ${{ env.colcon-build-default-cmake-args }} - cmake_build_type: ${{ matrix.cmake-build-type }} - workspace: ${{ github.workspace }} - - - name: Clean workspace - No security - if: ${{ always() }} - run: | - cd ${{ github.workspace }} - rm -rf build install log - - - name: No statistics colcon build - continue-on-error: true - if: ${{ always() }} - uses: eProsima/eProsima-CI/multiplatform/colcon_build@v0 - with: - colcon_meta_file: ${{ github.workspace }}/src/fastdds/.github/workflows/config/fastdds_build.meta - colcon_build_args: ${{ inputs.colcon-args }} - cmake_args: '-DFASTDDS_STATISTICS=OFF ${{ env.security-cmake-flag }} ${{ inputs.cmake-args }}' - cmake_args_default: ${{ env.colcon-build-default-cmake-args }} - cmake_build_type: ${{ matrix.cmake-build-type }} - workspace: ${{ github.workspace }} - - - name: Clean workspace - No statistics - if: ${{ always() }} - run: | - cd ${{ github.workspace }} - rm -rf build install log - - # No .metas file, so FASTDDS_ENFORCE_LOG_INFO is set OFF by default. Missed important args are manually included - - name: No enforcing log info colcon build - continue-on-error: true - if: ${{ always() }} - uses: eProsima/eProsima-CI/multiplatform/colcon_build@v0 - with: - colcon_meta_file: '' - colcon_build_args: ${{ inputs.colcon-args }} - cmake_args: '-DCOMPILE_EXAMPLES=ON ${{ env.security-cmake-flag }} ${{ inputs.cmake-args }}' - cmake_args_default: ${{ env.colcon-build-default-cmake-args }} - cmake_build_type: ${{ matrix.cmake-build-type }} - workspace: ${{ github.workspace }} - - - name: Clean workspace - No enforce log info - if: ${{ always() }} - run: | - cd ${{ github.workspace }} - rm -rf build install log - - - name: No shared libs colcon build - continue-on-error: true - if: ${{ always() }} - uses: eProsima/eProsima-CI/multiplatform/colcon_build@v0 - with: - colcon_meta_file: ${{ github.workspace }}/src/fastdds/.github/workflows/config/fastdds_build.meta - colcon_build_args: ${{ inputs.colcon-args }} - cmake_args: '-DBUILD_SHARED_LIBS=OFF ${{ env.security-cmake-flag }} ${{ inputs.cmake-args }}' - cmake_args_default: ${{ env.colcon-build-default-cmake-args }} - cmake_build_type: ${{ matrix.cmake-build-type }} - workspace: ${{ github.workspace }} diff --git a/.github/workflows/sanitizers-ci.yml b/.github/workflows/sanitizers-ci.yml deleted file mode 100644 index e4ec25ec298..00000000000 --- a/.github/workflows/sanitizers-ci.yml +++ /dev/null @@ -1,77 +0,0 @@ -name: Fast DDS Sanitizers CI - -on: - workflow_dispatch: - inputs: - label: - description: 'ID associated to the workflow' - required: true - type: string - run_asan_fastdds: - description: 'Run Addess Sanitizer job for Fast DDS' - required: false - type: boolean - run_asan_discovery_server: - description: 'Run Addess Sanitizer job for Discovery Server' - required: false - type: boolean - run_tsan_fastdds: - description: 'Run Thread Sanitizer job for Fast DDS' - required: false - type: boolean - colcon_build_args: - description: 'Optional colcon build arguments' - required: false - type: string - colcon_test_args: - description: 'Optional colcon test arguments' - required: false - type: string - cmake_args: - description: 'Optional CMake Compilation Flags' - required: false - type: string - ctest_args: - description: 'Optional CTest Testing Flags' - required: false - type: string - fastdds_ref: - description: 'Branch or tag of Fast DDS repository (https://github.com/eProsima/Fast-DDS)' - required: true - discovery_server_ref: - description: > - Branch or tag of Discovery Server repository (https://github.com/eProsima/Discovery-Server) - Required only if the Discovery Server job is requested - required: false - - pull_request: - types: - - review_requested - paths-ignore: - - '**.md' - - '**.txt' - - '!**/CMakeLists.txt' - -concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} - cancel-in-progress: true - -jobs: - sanitizers-ci: - if: ${{ ( - !contains(github.event.pull_request.labels.*.name, 'skip-ci') && - !contains(github.event.pull_request.labels.*.name, 'no-test') && - !contains(github.event.pull_request.labels.*.name, 'conflicts') - ) }} - uses: ./.github/workflows/reusable-sanitizers-ci.yml - with: - label: ${{ inputs.label || 'fastdds-sanitizers-ci' }} - run_asan_fastdds: ${{ ((inputs.run_asan_fastdds == true) && true) || github.event_name == 'pull_request' }} - run_asan_discovery_server: ${{ ((inputs.run_asan_discovery_server == true) && true) || github.event_name == 'pull_request' }} - run_tsan_fastdds: ${{ ((inputs.run_tsan_fastdds == true) && true) || github.event_name == 'pull_request' }} - colcon_build_args: ${{ inputs.colcon_build_args || '' }} - colcon_test_args: ${{ inputs.colcon_test_args || '' }} - cmake_args: ${{ inputs.cmake_args || '' }} - ctest_args: ${{ inputs.ctest_args || '' }} - fastdds_ref: ${{ inputs.fastdds_ref || github.ref || 'master' }} - discovery_server_ref: ${{ inputs.discovery_server_ref || 'master' }} diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml deleted file mode 100644 index d33b39bb693..00000000000 --- a/.github/workflows/windows-ci.yml +++ /dev/null @@ -1,51 +0,0 @@ -name: Fast DDS Windows CI - -on: - workflow_dispatch: - inputs: - label: - description: 'ID associated to the workflow. Must univocally identify artifacts.' - 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 - - pull_request: - types: - - review_requested - paths-ignore: - - '**.md' - - '**.txt' - - '!**/CMakeLists.txt' - -concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} - cancel-in-progress: true - -jobs: - windows-ci: - if: ${{ ( - !contains(github.event.pull_request.labels.*.name, 'skip-ci') && - !contains(github.event.pull_request.labels.*.name, 'conflicts') - ) }} - uses: ./.github/workflows/reusable-windows-ci.yml - with: - label: ${{ inputs.label || 'windows-ci' }} - 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' }} diff --git a/examples/cpp/delivery_mechanisms/SubscriberApp.cpp b/examples/cpp/delivery_mechanisms/SubscriberApp.cpp index fe001cce015..2fd997e2efc 100644 --- a/examples/cpp/delivery_mechanisms/SubscriberApp.cpp +++ b/examples/cpp/delivery_mechanisms/SubscriberApp.cpp @@ -165,6 +165,7 @@ SubscriberApp::SubscriberApp( { throw std::runtime_error("DataReader initialization failed"); } + std::cout << "subscriber created with " << max_samples << " samples" << std::endl; } SubscriberApp::~SubscriberApp() @@ -183,6 +184,7 @@ void SubscriberApp::on_subscription_matched( DataReader* /*reader*/, const SubscriptionMatchedStatus& info) { + std::cout << "subscriber match trigger" << std::endl; if (info.current_count_change == 1) { std::cout << "Subscriber matched." << std::endl; @@ -201,16 +203,20 @@ void SubscriberApp::on_subscription_matched( void SubscriberApp::on_data_available( DataReader* reader) { + std::cout << "subscriber on_data_available triggered" << std::endl; FASTDDS_CONST_SEQUENCE(DataSeq, DeliveryMechanisms); DataSeq delivery_mechanisms_sequence; SampleInfoSeq info_sequence; while ((!is_stopped()) && (RETCODE_OK == reader->take(delivery_mechanisms_sequence, info_sequence))) { + std::cout << "subscriber on_data_available loop" << std::endl; for (LoanableCollection::size_type i = 0; i < info_sequence.length(); ++i) { + std::cout << "subscriber on_data_available loanable loop" << std::endl; if ((info_sequence[i].instance_state == ALIVE_INSTANCE_STATE) && info_sequence[i].valid_data) { + std::cout << "subscriber on_data_available loaned sample" << std::endl; const DeliveryMechanisms& delivery_mechanisms_ = delivery_mechanisms_sequence[i]; received_samples_++; @@ -218,10 +224,12 @@ void SubscriberApp::on_data_available( delivery_mechanisms_.index() << "' RECEIVED" << std::endl; if ((samples_ > 0) && (received_samples_ >= samples_)) { + std::cout << "subscriber on_data_available received all samples" << std::endl; stop(); } } } + std::cout << "subscriber on_data_available returning loan" << std::endl; reader->return_loan(delivery_mechanisms_sequence, info_sequence); } }