From f446f3531fb25871574b24ab5b5c7ae2982f1857 Mon Sep 17 00:00:00 2001 From: jason-xy <1462357003@qq.com> Date: Thu, 23 Mar 2023 15:28:23 +0800 Subject: [PATCH 1/3] FIX: compile issue DETAIL: 1. When compile with catkin_make -j1 will occur make error due to wrong target dependency. 2. Add compile test ci pipeline. TEST: Compile & run with cuda/non-cuda version in docker container. --- .github/workflows/build-amd64.yml | 26 +++++++++++++++++++ .../Utils/multi_map_server/CMakeLists.txt | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/build-amd64.yml diff --git a/.github/workflows/build-amd64.yml b/.github/workflows/build-amd64.yml new file mode 100644 index 0000000..c5f48be --- /dev/null +++ b/.github/workflows/build-amd64.yml @@ -0,0 +1,26 @@ +name: Compile-test-amd64 + +on: + push: + branches: [ "master" ] + paths: + - '.github/workflows/build-amd64.yml' + - 'src/*' + + pull_request: + branches: [ "master" ] + paths: + - '.github/workflows/build-amd64.yml' + - 'src/*' + +jobs: + Compile-ego-planner-swarm-amd64: + runs-on: ubuntu-latest + steps: + - + name: Checkout + uses: actions/checkout@v3 + - + name: Start to Compile + run: | + docker run -v `pwd`:/root/ego-planner-swarm -it --rm jasonxxxyyy/robotics:runtime-cuda11.4-ros1-amd64 /bin/bash -c "source /opt/ros/noetic/setup.bash && cd /root/ego-planner-swarm && catkin_make" \ No newline at end of file diff --git a/src/uav_simulator/Utils/multi_map_server/CMakeLists.txt b/src/uav_simulator/Utils/multi_map_server/CMakeLists.txt index f467b0b..5544be7 100755 --- a/src/uav_simulator/Utils/multi_map_server/CMakeLists.txt +++ b/src/uav_simulator/Utils/multi_map_server/CMakeLists.txt @@ -164,7 +164,7 @@ add_executable(multi_map_visualization src/multi_map_visualization.cc) ## Add cmake target dependencies of the executable/library ## as an example, message headers may need to be generated before nodes -add_dependencies(multi_map_visualization multi_map_server_messages_cpp) +add_dependencies(multi_map_visualization multi_map_server_generate_messages_cpp) ## Specify libraries to link a library or executable target against target_link_libraries(multi_map_visualization From ba31b827c9f59f1e8534c919de8e5207a72cad21 Mon Sep 17 00:00:00 2001 From: jason-xy <1462357003@qq.com> Date: Thu, 23 Mar 2023 15:28:23 +0800 Subject: [PATCH 2/3] FIX: compile issue DETAIL: 1. When compile with catkin_make -j1 will occur make error due to wrong target dependency. 2. Add compile test ci pipeline. TEST: Compile & run with cuda/non-cuda version in docker container. --- .github/workflows/build-amd64.yml | 26 +++++++++++++++++++ .../Utils/multi_map_server/CMakeLists.txt | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/build-amd64.yml diff --git a/.github/workflows/build-amd64.yml b/.github/workflows/build-amd64.yml new file mode 100644 index 0000000..c5f48be --- /dev/null +++ b/.github/workflows/build-amd64.yml @@ -0,0 +1,26 @@ +name: Compile-test-amd64 + +on: + push: + branches: [ "master" ] + paths: + - '.github/workflows/build-amd64.yml' + - 'src/*' + + pull_request: + branches: [ "master" ] + paths: + - '.github/workflows/build-amd64.yml' + - 'src/*' + +jobs: + Compile-ego-planner-swarm-amd64: + runs-on: ubuntu-latest + steps: + - + name: Checkout + uses: actions/checkout@v3 + - + name: Start to Compile + run: | + docker run -v `pwd`:/root/ego-planner-swarm -it --rm jasonxxxyyy/robotics:runtime-cuda11.4-ros1-amd64 /bin/bash -c "source /opt/ros/noetic/setup.bash && cd /root/ego-planner-swarm && catkin_make" \ No newline at end of file diff --git a/src/uav_simulator/Utils/multi_map_server/CMakeLists.txt b/src/uav_simulator/Utils/multi_map_server/CMakeLists.txt index f467b0b..5544be7 100755 --- a/src/uav_simulator/Utils/multi_map_server/CMakeLists.txt +++ b/src/uav_simulator/Utils/multi_map_server/CMakeLists.txt @@ -164,7 +164,7 @@ add_executable(multi_map_visualization src/multi_map_visualization.cc) ## Add cmake target dependencies of the executable/library ## as an example, message headers may need to be generated before nodes -add_dependencies(multi_map_visualization multi_map_server_messages_cpp) +add_dependencies(multi_map_visualization multi_map_server_generate_messages_cpp) ## Specify libraries to link a library or executable target against target_link_libraries(multi_map_visualization From 399f4389589d1c9d464a6b91ade783743d72eb85 Mon Sep 17 00:00:00 2001 From: jason-xy <1462357003@qq.com> Date: Thu, 23 Mar 2023 15:41:08 +0800 Subject: [PATCH 3/3] fix github action tty error --- .github/workflows/build-amd64.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-amd64.yml b/.github/workflows/build-amd64.yml index c5f48be..6335cf9 100644 --- a/.github/workflows/build-amd64.yml +++ b/.github/workflows/build-amd64.yml @@ -23,4 +23,4 @@ jobs: - name: Start to Compile run: | - docker run -v `pwd`:/root/ego-planner-swarm -it --rm jasonxxxyyy/robotics:runtime-cuda11.4-ros1-amd64 /bin/bash -c "source /opt/ros/noetic/setup.bash && cd /root/ego-planner-swarm && catkin_make" \ No newline at end of file + docker run -v `pwd`:/root/ego-planner-swarm --rm jasonxxxyyy/robotics:runtime-cuda11.4-ros1-amd64 /bin/bash -c "source /opt/ros/noetic/setup.bash && cd /root/ego-planner-swarm && catkin_make" \ No newline at end of file