From e25a3c666d129b733cb7bf32fb75aaea8844de19 Mon Sep 17 00:00:00 2001 From: czoido Date: Mon, 11 Nov 2024 08:25:28 +0100 Subject: [PATCH] wip --- .github/workflows/ros-tests.yml | 20 ++----------------- .gitignore | 4 +++- .../tools/ros/rosenv/workspace/test_ros.sh | 12 +++++++++++ 3 files changed, 17 insertions(+), 19 deletions(-) create mode 100644 examples/tools/ros/rosenv/workspace/test_ros.sh diff --git a/.github/workflows/ros-tests.yml b/.github/workflows/ros-tests.yml index a5493930..7504ca8e 100644 --- a/.github/workflows/ros-tests.yml +++ b/.github/workflows/ros-tests.yml @@ -31,15 +31,7 @@ jobs: # Set up ROS environment and run the example with Conan release version shell: bash run: | - source /opt/ros/humble/setup.bash - conan profile detect - cd examples/tools/ros/rosenv/workspace - conan install str_printer/conanfile.txt --build=missing --output-folder install/conan - source install/conan/conanrosenv.sh - colcon build --packages-select str_printer - colcon build --packages-select consumer - source install/setup.bash - ros2 run consumer main + ./examples/tools/ros/rosenv/workspace/test_ros.sh # Test with Conan version from develop2 branch - name: Uninstall Conan release @@ -53,12 +45,4 @@ jobs: - name: Run example with Conan from repo shell: bash run: | - source /opt/ros/humble/setup.bash - conan profile detect - cd examples/tools/ros/rosenv/workspace - conan install str_printer/conanfile.txt --build=missing --output-folder install/conan - source install/conan/conanrosenv.sh - colcon build --packages-select str_printer - colcon build --packages-select consumer - source install/setup.bash - ros2 run consumer main + ./examples/tools/ros/rosenv/workspace/test_ros.sh diff --git a/.gitignore b/.gitignore index 029a62cc..f0e0b113 100644 --- a/.gitignore +++ b/.gitignore @@ -79,4 +79,6 @@ examples/tools/google/bazeltoolchain/7_x/string_formatter/MODULE.bazel.lock examples/libraries/libcurl/ascii_art_color/conan/* examples/libraries/libcurl/ascii_art_color/asciiartgen/x64/* examples/libraries/libcurl/ascii_art_color/x64/Release/* -examples/tools/ros/rosenv/workspace/* + +examples/tools/ros/rosenv/workspace/install/ +examples/tools/ros/rosenv/workspace/log/ diff --git a/examples/tools/ros/rosenv/workspace/test_ros.sh b/examples/tools/ros/rosenv/workspace/test_ros.sh new file mode 100644 index 00000000..ae96d794 --- /dev/null +++ b/examples/tools/ros/rosenv/workspace/test_ros.sh @@ -0,0 +1,12 @@ +source /opt/ros/humble/setup.bash +conan profile detect --force +cd examples/tools/ros/rosenv/workspace +conan install str_printer/conanfile.txt --build=missing --output-folder install/conan +source install/conan/conanrosenv.sh +colcon build --packages-select str_printer +colcon build --packages-select consumer +source install/setup.bash +ros2 run consumer main +rm -rf ./install +rm -rf ./log +rm -rf ./build