Skip to content

Commit

Permalink
Fix github action running (#1)
Browse files Browse the repository at this point in the history
* Fix docker and github action script.

* Remove unnecessary includes

* Fix to run clean build

---------

Co-authored-by: Jongkuk Lim <limjk@jmarple.ai>
  • Loading branch information
JeiKeiLim and Jongkuk Lim authored Nov 21, 2023
1 parent a4bd820 commit e863174
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 7 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/docker-build-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ jobs:
shell: bash
options: -v ${{ github.workspace }}:/home/user/flexxlam_sdk
run: |
mkdir ~/flexxlam_sdk/build && \
rm -rf ~/flexxlam_sdk/build && \
mkdir -p ~/flexxlam_sdk/build && \
cd ~/flexxlam_sdk/build && \
cmake .. && \
make -j
Expand All @@ -57,7 +58,8 @@ jobs:
shell: bash
options: -v ${{ github.workspace }}:/home/user/flexxlam_sdk
run: |
mkdir ~/flexxlam_sdk/build && \
rm -rf ~/flexxlam_sdk/build && \
mkdir -p ~/flexxlam_sdk/build && \
cd ~/flexxlam_sdk/build && \
cmake -Dtest=true .. && \
make -j && \
Expand Down
5 changes: 4 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ option(test "Build unit tests." OFF)

set(INSTALL_STATIC "Install static library" ON)
set(INSTALL_SHARED "Install shared library" ON)
set(BUILD_EXAMPLES "Build examples" ON)

set (CPACK_PACKAGE_NAME ${PROJECT_NAME})
set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "FlexXlam SDK")
Expand Down Expand Up @@ -107,7 +108,9 @@ if (INSTALL_SHARED)
endif()

# Examples
add_subdirectory(examples/client)
if (BUILD_EXAMPLES)
add_subdirectory(examples/client)
endif()

# Unit test
if (test)
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ RUN git clone https://github.com/google/glog.git -b v0.6.0 && \
sudo cmake --build build --target install

# Install formatter, linter
RUN sudo apt-get install -y python3-pip cppcheck flex bison libserial-dev graphviz
RUN sudo apt-get install -y python3-pip cppcheck flex bison libserial-dev graphviz libgtest-dev
RUN python3 -m pip install cpplint clang-format
RUN git clone https://github.com/doxygen/doxygen.git -b Release_1_9_8 \
&& mkdir -p doxygen/build \
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.aarch64
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ RUN git clone https://github.com/google/glog.git -b v0.6.0 && \
sudo cmake --build build --target install

# Install formatter, linter
RUN sudo apt-get install -y python3-pip cppcheck flex bison libserial-dev
RUN sudo apt-get install -y python3-pip cppcheck flex bison libserial-dev libgtest-dev
RUN python3 -m pip install cpplint clang-format

RUN sudo usermod -aG dialout user
Expand Down
1 change: 0 additions & 1 deletion examples/client/flexxlam_client_example.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include <protocol/request/request_ethernet_communication_config.hpp>
#include <protocol/request/request_mavlink_communication_config.hpp>
#include <protocol/request/request_serial_communication_config.hpp>
#include <utils/string_utils.hpp>

namespace flexxlam {

Expand Down
1 change: 0 additions & 1 deletion include/protocol/command/command_save_pcd_protocol.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
#include <vector>

#include "protocol/base_protocol.hpp"
#include "utils/string_utils.hpp"
#include "utils/to_bytes.hpp"

namespace flexxlam {
Expand Down

0 comments on commit e863174

Please sign in to comment.