From 9ad7117e9a91bc940de10b72105b854bf868096e Mon Sep 17 00:00:00 2001 From: Christian Henkel <6976069+ct2034@users.noreply.github.com> Date: Thu, 27 Jun 2024 10:15:52 +0200 Subject: [PATCH] Adopting CI changes similar to jazzy #358 (#368) * Adoptin Ci changes similar to jazzy Signed-off-by: Christian Henkel * also ignoring pep257 here ... Signed-off-by: Christian Henkel --------- Signed-off-by: Christian Henkel --- .github/workflows/lint.yaml | 12 +++++++++--- .github/workflows/test.yaml | 5 +++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 3488e94e..4f926eef 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -18,17 +18,23 @@ jobs: cppcheck, cpplint, flake8, - pep257, + # pep257, TODO: enable when we fixed + # Error: diagnostic_common_diagnostics/diagnostic_common_diagnostics/ntp_monitor.py:113 in public method `ntp_diag`: D417: Missing argument descriptions in the docstring (argument(s) st are missing descriptions in 'ntp_diag' docstring) + # using ros-rolling-ament-pep257 amd64 0.18.0-1noble.20240426.150718 uncrustify, xmllint, ] - runs-on: ubuntu-latest + include: + - distro: rolling + os: ubuntu-24.04 + runs-on: ${{ matrix.os }} env: AMENT_CPPCHECK_ALLOW_SLOW_VERSIONS: 1 steps: - uses: actions/checkout@v1 - uses: ros-tooling/setup-ros@master - - run: sudo pip install pydocstyle==6.1.1 # downgrade to fix https://github.com/ament/ament_lint/pull/428 + with: + required-ros-distributions: ${{ matrix.distro }} - uses: ros-tooling/action-ros-lint@master with: linter: ${{ matrix.linter }} diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index ab3f6a3d..224a0cf3 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -14,8 +14,7 @@ jobs: strategy: fail-fast: false matrix: - package: - [ + package: [ diagnostic_aggregator, diagnostic_common_diagnostics, diagnostic_updater, @@ -28,6 +27,8 @@ jobs: container: ubuntu:${{ matrix.os }} steps: - uses: ros-tooling/setup-ros@master + with: + required-ros-distributions: ${{ matrix.distro }} - uses: ros-tooling/action-ros-ci@master with: target-ros2-distro: ${{ matrix.distro }}