From 74a67ef763a25710bf7ff77c4875870d549df6a6 Mon Sep 17 00:00:00 2001 From: Wiktor Bajor Date: Sun, 18 Aug 2024 12:40:18 +0200 Subject: [PATCH 1/4] Fix CI linters --- .github/actions/lint/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/lint/action.yml b/.github/actions/lint/action.yml index c7db400..9196119 100644 --- a/.github/actions/lint/action.yml +++ b/.github/actions/lint/action.yml @@ -3,5 +3,5 @@ name: Lint description: Lint using devcontainer runs: using: docker - image: ../../../.devcontainer/Dockerfile + image: osrf/ros:iron-desktop entrypoint: .github/actions/lint/run.sh From 0a894cb845e10bdbd22da4d86646af1d8a8ea949 Mon Sep 17 00:00:00 2001 From: Wiktor Bajor Date: Sun, 18 Aug 2024 12:49:23 +0200 Subject: [PATCH 2/4] Fix CI linters --- .github/actions/lint/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/lint/action.yml b/.github/actions/lint/action.yml index 9196119..e1571ac 100644 --- a/.github/actions/lint/action.yml +++ b/.github/actions/lint/action.yml @@ -3,5 +3,5 @@ name: Lint description: Lint using devcontainer runs: using: docker - image: osrf/ros:iron-desktop + image: osrf/ros:iron-desktop-full entrypoint: .github/actions/lint/run.sh From 3a4507db882c603d7c6d091c0af3e8922821a891 Mon Sep 17 00:00:00 2001 From: Wiktor Bajor Date: Sun, 18 Aug 2024 12:55:35 +0200 Subject: [PATCH 3/4] Remove rosdep isntall from linter linter ci --- .github/actions/lint/action.yml | 2 +- .github/actions/lint/run.sh | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/actions/lint/action.yml b/.github/actions/lint/action.yml index e1571ac..c7db400 100644 --- a/.github/actions/lint/action.yml +++ b/.github/actions/lint/action.yml @@ -3,5 +3,5 @@ name: Lint description: Lint using devcontainer runs: using: docker - image: osrf/ros:iron-desktop-full + image: ../../../.devcontainer/Dockerfile entrypoint: .github/actions/lint/run.sh diff --git a/.github/actions/lint/run.sh b/.github/actions/lint/run.sh index 50a3ebb..3441cf7 100755 --- a/.github/actions/lint/run.sh +++ b/.github/actions/lint/run.sh @@ -2,8 +2,6 @@ set -e sudo apt-get update -./setup.sh - if [[ "ament_flake8" == "ament_${LINTER}" ]]; then ament_${LINTER} . --config python_linter.flake8 else From 877347623c5b4b722f8b5bd15753fd02b003910e Mon Sep 17 00:00:00 2001 From: Wiktor Bajor Date: Sun, 18 Aug 2024 13:01:47 +0200 Subject: [PATCH 4/4] Add ament_lint to dockerfile --- .devcontainer/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 047b401..1eaba85 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -29,6 +29,7 @@ RUN sudo wget https://packages.osrfoundation.org/gazebo.gpg -O /usr/share/keyrin ros-$ROS_DISTRO-ros2-controllers \ ros-$ROS_DISTRO-rmw-cyclonedds-cpp \ ros-$ROS_DISTRO-gripper-controllers \ + ament-lint \ && apt-get autoremove -y \ && apt-get clean \ && rm -rf /var/lib/apt/lists/*