Fix docker and github action script.

j-marple-dev · Nov 21, 2023 · bc0b69a · bc0b69a
1 parent a4bd820
commit bc0b69a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/docker-build-test.yaml b/.github/workflows/docker-build-test.yaml
@@ -41,7 +41,7 @@ jobs:
           shell: bash
           options: -v ${{ github.workspace }}:/home/user/flexxlam_sdk
           run: |
-            mkdir ~/flexxlam_sdk/build && \
+            mkdir -p ~/flexxlam_sdk/build && \
             cd ~/flexxlam_sdk/build && \
             cmake .. && \
             make -j
@@ -57,7 +57,7 @@ jobs:
           shell: bash
           options: -v ${{ github.workspace  }}:/home/user/flexxlam_sdk
           run: |
-            mkdir ~/flexxlam_sdk/build && \
+            mkdir -p ~/flexxlam_sdk/build && \
             cd ~/flexxlam_sdk/build && \
             cmake -Dtest=true .. && \
             make -j && \

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -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")
@@ -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)

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -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 \

diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64
@@ -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