From 37fa4bccb638410734e077ef18c3c9c0ecd117c4 Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Wed, 20 Apr 2022 22:25:56 +1200 Subject: [PATCH] mavsdk_tests: update MAVSDK dependency This should fix the CI issue where the test just hangs trying to connect. --- .github/workflows/sitl_tests.yml | 4 ++-- test/mavsdk_tests/CMakeLists.txt | 9 --------- test/mavsdk_tests/MAVSDK_VERSION | 2 +- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/.github/workflows/sitl_tests.yml b/.github/workflows/sitl_tests.yml index 2a92872759..1f6b023531 100644 --- a/.github/workflows/sitl_tests.yml +++ b/.github/workflows/sitl_tests.yml @@ -29,9 +29,9 @@ jobs: token: ${{ secrets.ACCESS_TOKEN }} - name: Download MAVSDK - run: wget "https://github.com/mavlink/MAVSDK/releases/download/v$(cat test/mavsdk_tests/MAVSDK_VERSION)/mavsdk_$(cat test/mavsdk_tests/MAVSDK_VERSION)_ubuntu20.04_amd64.deb" + run: wget "https://github.com/mavlink/MAVSDK/releases/download/v$(cat test/mavsdk_tests/MAVSDK_VERSION)/libmavsdk-dev_$(cat test/mavsdk_tests/MAVSDK_VERSION)_ubuntu20.04_amd64.deb" - name: Install MAVSDK - run: dpkg -i "mavsdk_$(cat test/mavsdk_tests/MAVSDK_VERSION)_ubuntu20.04_amd64.deb" + run: dpkg -i "libmavsdk-dev_$(cat test/mavsdk_tests/MAVSDK_VERSION)_ubuntu20.04_amd64.deb" - name: Prepare ccache timestamp id: ccache_cache_timestamp diff --git a/test/mavsdk_tests/CMakeLists.txt b/test/mavsdk_tests/CMakeLists.txt index 6459d3c3d4..8f96ab644c 100644 --- a/test/mavsdk_tests/CMakeLists.txt +++ b/test/mavsdk_tests/CMakeLists.txt @@ -25,15 +25,6 @@ if(MAVSDK_FOUND) target_link_libraries(mavsdk_tests MAVSDK::mavsdk - MAVSDK::mavsdk_action - MAVSDK::mavsdk_failure - MAVSDK::mavsdk_info - MAVSDK::mavsdk_manual_control - MAVSDK::mavsdk_mission - MAVSDK::mavsdk_mission_raw - MAVSDK::mavsdk_offboard - MAVSDK::mavsdk_param - MAVSDK::mavsdk_telemetry ${CMAKE_THREAD_LIBS_INIT} ) diff --git a/test/mavsdk_tests/MAVSDK_VERSION b/test/mavsdk_tests/MAVSDK_VERSION index a758a09aae..3a3cd8cc8b 100644 --- a/test/mavsdk_tests/MAVSDK_VERSION +++ b/test/mavsdk_tests/MAVSDK_VERSION @@ -1 +1 @@ -0.48.0 +1.3.1