Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .docker/lyrical.amd64.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ COPY . dave
RUN vcs import --shallow --skip-existing \
--input dave/extras/repos/dave.lyrical.repos

RUN rosdep update --rosdistro "$ROS_DISTRO" && \
RUN apt-get update && \
rosdep update --rosdistro "$ROS_DISTRO" && \
rosdep install --rosdistro "$ROS_DISTRO" -iy --from-paths . && \
rm -rf /var/lib/apt/lists/*

Expand Down
7 changes: 5 additions & 2 deletions .docker/lyrical.arm64v8.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,11 @@ RUN vcs import --shallow --skip-existing \
--input dave/extras/repos/dave.lyrical.repos && \
chown -R $USER:$USER $DAVE_UNDERLAY

RUN rosdep init 2>/dev/null || true && rosdep update --rosdistro $ROS_DISTRO && \
rosdep install --rosdistro $ROS_DISTRO -iy --from-paths .
RUN apt-get update && \
(rosdep init 2>/dev/null || true) && \
rosdep update --rosdistro $ROS_DISTRO && \
rosdep install --rosdistro $ROS_DISTRO -iy --from-paths . && \
rm -rf /var/lib/apt/lists/*

USER $USER
WORKDIR $DAVE_UNDERLAY
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,10 @@ jobs:
- name: Install Python dependencies
run: pip install black flake8 cmakelang

- name: Install ClangFormat
run: sudo apt-get install -y clang-format
- name: Install system lint dependencies
run: |
sudo apt-get update
sudo apt-get install -y clang-format libxml2-utils

- name: Run Linters for python and C++
uses: wearerequired/lint-action@v2
Expand All @@ -55,9 +57,6 @@ jobs:
flake8_args: --max-line-length=100
clang_format: true

- name: Install XML Linting tools
run: sudo apt-get install -y libxml2-utils

- name: Run XML Linter for URDF, SDF, Xacro, XML files
run: |
find . \( -iname '*.urdf' -o -iname '*.sdf' -o -iname '*.xacro' \
Expand Down
Loading