Skip to content

Commit

Permalink
style(pre-commit): autofix
Browse files Browse the repository at this point in the history
  • Loading branch information
pre-commit-ci[bot] committed Dec 20, 2023
1 parent 31096b0 commit cbf925d
Show file tree
Hide file tree
Showing 17 changed files with 17 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .github/actions/docker-build-and-push/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ runs:
latest=false
prefix=${{ inputs.tag-prefix }}
suffix=-prebuilt${{ inputs.tag-suffix }}
- name: Docker meta for monolithic
id: meta-monolithic
uses: docker/metadata-action@v4
Expand Down
2 changes: 1 addition & 1 deletion amd64.env
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ base_image=ros:humble-ros-base-jammy
cuda_version=12.3
cudnn_version=8.9.5.29-1+cuda12.2
tensorrt_version=8.6.1.6-1+cuda12.0
pre_commit_clang_format_version=17.0.5
pre_commit_clang_format_version=17.0.5
4 changes: 2 additions & 2 deletions ansible/playbooks/openadk.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
when: module == 'main-perception' or module == 'all' and prompt_install_nvidia=='y'
- role: autoware.dev_env.pacmod
when: module == 'planning-control' or module == 'main-perception' or module == 'all'

# Development environment
- role: autoware.dev_env.devel
when: install_devel == 'true'
Expand All @@ -41,4 +41,4 @@

# ONNX files and other artifacts

Check failure on line 42 in ansible/playbooks/openadk.yaml

View workflow job for this annotation

GitHub Actions / pre-commit-ansible

yaml[comments-indentation]

Comment not indented like content
# - role: autoware.dev_env.artifacts
# when: install_devel == 'false'
# when: install_devel == 'false'
4 changes: 2 additions & 2 deletions ansible/playbooks/universe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@
when: rosdistro != 'rolling'
- role: autoware.dev_env.tensorrt
when: prompt_install_nvidia == 'y'

# Autoware devel dependencies
- role: autoware.dev_env.devel
when: install_devel == 'true'

# ONNX files and other artifacts
- role: autoware.dev_env.artifacts
when: prompt_download_artifacts == 'y'
when: prompt_download_artifacts == 'y'
2 changes: 1 addition & 1 deletion ansible/roles/cuda/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,4 @@
line: export LD_LIBRARY_PATH="/usr/local/cuda/lib64:$LD_LIBRARY_PATH"
state: present
create: true
mode: 0644
mode: 0644
1 change: 0 additions & 1 deletion ansible/roles/devel/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,3 @@ This role installs development dependencies for Autoware.
None.

## Manual Installation

1 change: 0 additions & 1 deletion ansible/roles/geographiclib/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# geographiclib


## Inputs

None.
Expand Down
1 change: 0 additions & 1 deletion ansible/roles/geographiclib/meta/main.yaml
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@

2 changes: 1 addition & 1 deletion ansible/roles/nvidia_docker/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@
- name: Restart docker engine for nvidia runtime support

Check failure on line 27 in ansible/roles/nvidia_docker/tasks/main.yaml

View workflow job for this annotation

GitHub Actions / pre-commit-ansible

no-changed-when

Commands should not change things if nothing needs doing.
ansible.builtin.shell: |
sudo systemctl restart docker
sudo systemctl restart docker
1 change: 0 additions & 1 deletion ansible/roles/pacmod/meta/main.yaml
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@

1 change: 0 additions & 1 deletion ansible/roles/rmw_implementation/meta/main.yaml
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@

6 changes: 3 additions & 3 deletions docker/autoware-openadk/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ RUN --mount=type=ssh \
&& pip uninstall -y ansible ansible-core \
&& apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/* "$HOME"/.cache \
&& find / -name 'libcu*.a' -delete \
&& find / -name 'libnv*.a' -delete
&& find / -name 'libnv*.a' -delete

# Copy repository files
COPY autoware.repos /autoware/
Expand Down Expand Up @@ -99,7 +99,7 @@ RUN --mount=type=ssh \
&& mkdir src \
&& vcs import src < autoware.repos \
&& rosdep update \
&& DEBIAN_FRONTEND=noninteractive rosdep install -y --ignore-src --from-paths src --rosdistro "$ROS_DISTRO" \
&& DEBIAN_FRONTEND=noninteractive rosdep install -y --ignore-src --from-paths src --rosdistro "$ROS_DISTRO" \
&& apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/* "$HOME"/.cache \
&& find /usr/lib/$LIB_DIR-linux-gnu -name "*.a" -type f -delete \
&& find / -name "*.o" -type f -delete \
Expand Down Expand Up @@ -138,4 +138,4 @@ RUN echo "source /autoware/install/setup.bash" > /etc/bash.bashrc
COPY docker/autoware-openadk/etc/ros_entrypoint.sh /ros_entrypoint.sh
RUN chmod +x /ros_entrypoint.sh
ENTRYPOINT ["/ros_entrypoint.sh"]
CMD ["bash"]
CMD ["bash"]
2 changes: 1 addition & 1 deletion docker/autoware-openadk/docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ target "monolithic" {
inherits = ["docker-metadata-action-monolithic"]
dockerfile = "docker/autoware-openadk/Dockerfile"

Check warning on line 31 in docker/autoware-openadk/docker-bake.hcl

View workflow job for this annotation

GitHub Actions / spell-check-differential

Unknown word (openadk)
target = "monolithic"
}
}
2 changes: 1 addition & 1 deletion docker/autoware-openadk/etc/.bash_aliases
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ function download_rosbag_file() {
unzip -d ~/autoware_map/ ~/autoware_map/sample-rosbag.zip
fi
}
alias awf-play-sample-rosbag='download_rosbag_file&&ros2 bag play ~/autoware_map/sample-rosbag/sample.db3 -r 0.35 -s sqlite3'
alias awf-play-sample-rosbag='download_rosbag_file&&ros2 bag play ~/autoware_map/sample-rosbag/sample.db3 -r 0.35 -s sqlite3'
2 changes: 1 addition & 1 deletion docker/autoware-openadk/etc/ros_entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ set -e

source /opt/ros/humble/setup.bash
source /autoware/install/setup.bash
exec "$@"
exec "$@"
4 changes: 2 additions & 2 deletions docker/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ done
# Launch Autoware with custom map
echo "Launching Autoware with the map >> "${MAP_PATH}
docker run -it --rm --net=host --gpus all -e DISPLAY=$DISPLAY -v /tmp/.X11-unix/:/tmp/.X11-unix \
-v ${MAP_PATH}:/autoware_map ghcr.io/autowarefoundation/autoware-openadk:monolithic-humble-latest-cuda \
ros2 launch autoware_launch autoware.launch.xml map_path:=/autoware_map vehicle_model:=sample_vehicle sensor_model:=sample_sensor_kit
-v ${MAP_PATH}:/autoware_map ghcr.io/autowarefoundation/autoware-openadk:monolithic-humble-latest-cuda \
ros2 launch autoware_launch autoware.launch.xml map_path:=/autoware_map vehicle_model:=sample_vehicle sensor_model:=sample_sensor_kit
2 changes: 1 addition & 1 deletion setup-dev-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ fi

# Check installation of dev package
if [ "$option_runtime" = "true" ]; then
ansible_args+=("--extra-vars" "ros2_installation_type=ros-base") # ROS installation type, default "desktop"
ansible_args+=("--extra-vars" "ros2_installation_type=ros-base") # ROS installation type, default "desktop"
ansible_args+=("--extra-vars" "install_devel=false")
else
ansible_args+=("--extra-vars" "install_devel=true")
Expand Down

0 comments on commit cbf925d

Please sign in to comment.