From 2ddb721f6c3b2568ab6e84dc2a45d9a05ce6e60b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20=C3=81ngel=20Gonz=C3=A1lez=20Santamarta?= Date: Fri, 13 Dec 2024 16:53:37 +0100 Subject: [PATCH] doxygen workflow and dockerfile fixed --- .github/workflows/doxygen-deployment.yml | 11 ++++++++--- Dockerfile | 5 +---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/doxygen-deployment.yml b/.github/workflows/doxygen-deployment.yml index 0addc27..febb4a8 100644 --- a/.github/workflows/doxygen-deployment.yml +++ b/.github/workflows/doxygen-deployment.yml @@ -16,14 +16,19 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - name: Generate Doxygen + - name: Generate Doxygen for C++ uses: mattnotmitt/doxygen-action@edge with: - doxyfile-path: ".github/Doxyfile" + doxyfile-path: ".github/Doxyfile-cpp" + + - name: Generate Doxygen for Python + uses: mattnotmitt/doxygen-action@edge + with: + doxyfile-path: ".github/Doxyfile-python" - name: Deploy Doxygen page uses: peaceiris/actions-gh-pages@v4 with: github_token: ${{ secrets.GITHUB_TOKEN }} publish_branch: gh-pages - publish_dir: docs/html + publish_dir: docs diff --git a/Dockerfile b/Dockerfile index ceaedc2..ed4f926 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,10 +10,7 @@ COPY . /root/ros2_ws/src # install dependencies RUN source /opt/ros/${ROS_DISTRO}/setup.bash RUN apt-get update -RUN rosdep update && rosdep install --from-paths src --ignore-src -r -y -RUN if [ "$ROS_DISTRO" = "foxy" ] || [ "$ROS_DISTRO" = "galactic" ] || [ "$ROS_DISTRO" = "rolling" ]; then \ - apt install -y ros-$ROS_DISTRO-example-interfaces; \ - fi +RUN rosdep update && rosdep install --from-paths src --ignore-src -r -y --include-eol-distros # colcon the ws FROM deps AS builder