Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Check formatting before merge #19

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Check formatting before merge #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb9a26d
update action
loganzartman Jan 28, 2021
e99447d
make format
loganzartman Jan 28, 2021
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
8 changes: 8 additions & 0 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,11 @@ jobs:
with:
submodules: recursive
- run: scripts/ci-test.sh
check-format:
name: Formatted with `make format`
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
submodules: recursive
- run: make check-format
5 changes: 5 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
SHELL = /bin/bash
.SUFFIXES:

.PHONY: all
Expand All @@ -19,6 +20,10 @@ clean:
format:
clang-format --style=file -i src/**.cpp src/**.hpp

.PHONY: check-format
check-format:
diff -u <(cat src/**.cpp src/**.hpp) <(clang-format --style=file src/**.cpp src/**.hpp)

build/client: build/Makefile
(cd build; make -j)

Expand Down
3 changes: 2 additions & 1 deletion src/WebVizConstants.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ static const std::string odometry_topic = "odometry/raw";
static const std::string lidar_2d_topic = "velodyne_2dscan";

/**
* @brief (sensor_msgs/CompressedImage) prefix for a Compressed Image from a stereo camera.
* @brief (sensor_msgs/CompressedImage) prefix for a Compressed Image from a
* stereo camera.
*/
static const std::string compressed_image_prefix = "image_compressed/";

Expand Down