Skip to content

Commit

Permalink
Fix CI documentation workflow label triggering (#4456) (#4471)
Browse files Browse the repository at this point in the history
* Fix CI documentation workflow label triggering (#4456)

* Refs #20529: Fix documentation workflow label triggering

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #20529: Refactor documentation-tests workflow to use eProsima-CI

Signed-off-by: EduPonz <[email protected]>

* Refs #20529: Add workspace to colcon_build and colcon_test actions

Signed-off-by: EduPonz <[email protected]>

* Refs #20529: Set eProsima-CI actions to v0

Signed-off-by: EduPonz <[email protected]>

* Refs #20529: Add .meta and specify all colcon action args

Signed-off-by: EduPonz <[email protected]>

---------

Signed-off-by: JesusPoderoso <[email protected]>
Signed-off-by: EduPonz <[email protected]>
Co-authored-by: EduPonz <[email protected]>
(cherry picked from commit c4dbe83)

* Refs #20529: Fix doc issue in 2.6.x

Signed-off-by: JesusPoderoso <[email protected]>

---------

Signed-off-by: JesusPoderoso <[email protected]>
Co-authored-by: Jesús Poderoso <[email protected]>
Co-authored-by: JesusPoderoso <[email protected]>
  • Loading branch information
3 people authored Mar 12, 2024
1 parent c293fa8 commit 8a6dae4
Show file tree
Hide file tree
Showing 4 changed files with 88 additions and 37 deletions.
13 changes: 0 additions & 13 deletions .github/actions/install-apt-packages-documentation/action.yml

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"
93 changes: 71 additions & 22 deletions .github/workflows/documentation-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,24 +40,47 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Sync eProsima/Fast-DDS repository
uses: actions/checkout@v3
uses: eProsima/eProsima-CI/external/checkout@v0
with:
path: src/fastrtps
submodules: true

- name: Install Fast DDS packages
uses: ./src/fastrtps/.github/actions/install-apt-packages

- name: Install documentation packages
uses: ./src/fastrtps/.github/actions/install-apt-packages-documentation
- name: Get minimum supported version of CMake
uses: eProsima/eProsima-CI/external/get-cmake@v0
with:
cmakeVersion: '3.20.6'

- name: Setup CCache
uses: eProsima/eProsima-CI/external/setup-ccache-action@v0

- name: Download FastDDS dependencies
run: |
pip3 install vcstool
vcs import --skip-existing src < ./src/fastrtps/fastrtps.repos
- name: Install apt dependencies
uses: eProsima/eProsima-CI/ubuntu/install_apt_packages@v0
with:
packages: curl grep wget libssl-dev doxygen imagemagick plantuml
update: false
upgrade: false

- name: Install GTest
uses: eProsima/eProsima-CI/multiplatform/install_gtest@v0
with:
cmake_build_type: Release
version: release-1.11.0

- name: Install Python dependencies
uses: eProsima/eProsima-CI/multiplatform/install_python_packages@v0
with:
packages: vcstool
upgrade: false

- name: Install colcon
uses: eProsima/eProsima-CI/ubuntu/install_colcon@v0

- name: Download Fast DDS .repos
uses: eProsima/eProsima-CI/ubuntu/vcs_import@v0
with:
vcs_repos_file: ./src/fastrtps/fastrtps.repos
destination_workspace: src
skip_existing: 'true'

- name: Determine the Fast DDS Documentation branch to be used
run: |
Expand Down Expand Up @@ -110,25 +133,51 @@ jobs:
fi
- name: Download FastDDS documentation repo
uses: actions/checkout@v4
uses: eProsima/eProsima-CI/external/checkout@v0
with:
repository: eProsima/Fast-DDS-docs
path: src/fastdds-docs
ref: ${{ env.ACTION_BRANCH_NAME }}

- name: Install colcon
uses: eProsima/eProsima-CI/ubuntu/install_colcon@v0

- name: Install required python packages
- 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: Build documentation
run: |
colcon build --event-handlers=console_direct+ --metas
- name: Run documentation tests
run: |
colcon test --event-handlers=console_direct+ --packages-select fastdds-docs --return-code-on-test-failure
- name: Colcon build
continue-on-error: false
uses: eProsima/eProsima-CI/multiplatform/colcon_build@v0
with:
colcon_meta_file: './src/fastrtps/.github/workflows/config/documentation.meta'
colcon_build_args: ''
colcon_build_args_default: ''
cmake_args: ''
cmake_args_default: ''
cmake_build_type: Release
workspace: ${{ github.workspace }}
workspace_dependencies: ''

- name: Colcon test
id: test
if: ${{ !contains(github.event.pull_request.labels.*.name, 'no-test') }}
uses: eProsima/eProsima-CI/multiplatform/colcon_test@v0
with:
colcon_test_args: ''
colcon_test_args_default: --event-handlers=console_direct+
ctest_args: ''
ctest_args_default: ''
packages_names: fastdds-docs
workspace: ${{ github.workspace }}
workspace_dependencies: ''
test_report_artifact: ${{ format('test_report_{0}', github.job, join(matrix.*, '_')) }}

- name: Test summary
uses: eProsima/eProsima-CI/multiplatform/junit_summary@v0
if: ${{ !cancelled() && !contains(github.event.pull_request.labels.*.name, 'no-test') }}
with:
junit_reports_dir: "${{ steps.test.outputs.ctest_results_path }}"
print_summary: 'True'
show_failed: 'True'
show_disabled: 'False'
show_skipped: 'False'
2 changes: 0 additions & 2 deletions include/fastrtps/xmlparser/XMLEndpointParser.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@
#include <string>
#include <vector>

#include <tinyxml2.h>

#include <fastdds/rtps/builtin/data/ReaderProxyData.h>
#include <fastdds/rtps/builtin/data/WriterProxyData.h>
#include <fastrtps/xmlparser/XMLParserCommon.h>
Expand Down

0 comments on commit 8a6dae4

Please sign in to comment.