From 4bb45890fe3b4a5657837d72a32297489676062e Mon Sep 17 00:00:00 2001 From: Jonas Vautherin Date: Mon, 20 Jun 2022 19:39:00 +0200 Subject: [PATCH 1/2] Dependencies should propagate CMAKE_PREFIX_PATH --- third_party/absl/CMakeLists.txt | 1 + third_party/cares/CMakeLists.txt | 1 + third_party/curl/CMakeLists.txt | 1 + third_party/grpc/CMakeLists.txt | 2 +- third_party/jsoncpp/CMakeLists.txt | 1 + third_party/mavlink/CMakeLists.txt | 1 + third_party/protobuf/CMakeLists.txt | 2 +- third_party/tinyxml2/CMakeLists.txt | 1 + third_party/zlib/CMakeLists.txt | 1 + 9 files changed, 9 insertions(+), 2 deletions(-) diff --git a/third_party/absl/CMakeLists.txt b/third_party/absl/CMakeLists.txt index 638ec319f9..128d818c03 100644 --- a/third_party/absl/CMakeLists.txt +++ b/third_party/absl/CMakeLists.txt @@ -4,6 +4,7 @@ project(external-absl) include(ExternalProject) list(APPEND CMAKE_ARGS + "-DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH}" "-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}" "-DCMAKE_TOOLCHAIN_FILE:PATH=${CMAKE_TOOLCHAIN_FILE}" "-DCMAKE_POSITION_INDEPENDENT_CODE=ON" diff --git a/third_party/cares/CMakeLists.txt b/third_party/cares/CMakeLists.txt index cb6512cdd0..e0447e7813 100644 --- a/third_party/cares/CMakeLists.txt +++ b/third_party/cares/CMakeLists.txt @@ -4,6 +4,7 @@ project(external-cares) include(ExternalProject) list(APPEND CMAKE_ARGS + "-DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH}" "-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}" "-DCMAKE_TOOLCHAIN_FILE:PATH=${CMAKE_TOOLCHAIN_FILE}" "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" diff --git a/third_party/curl/CMakeLists.txt b/third_party/curl/CMakeLists.txt index 916e2ce17d..ad33fe0c57 100644 --- a/third_party/curl/CMakeLists.txt +++ b/third_party/curl/CMakeLists.txt @@ -4,6 +4,7 @@ project(external-curl) include(ExternalProject) list(APPEND CMAKE_ARGS + "-DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH}" "-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}" "-DCMAKE_TOOLCHAIN_FILE:PATH=${CMAKE_TOOLCHAIN_FILE}" "-DCMAKE_POSITION_INDEPENDENT_CODE=ON" diff --git a/third_party/grpc/CMakeLists.txt b/third_party/grpc/CMakeLists.txt index defb75dc1c..fa5cbc7bfe 100644 --- a/third_party/grpc/CMakeLists.txt +++ b/third_party/grpc/CMakeLists.txt @@ -4,9 +4,9 @@ project(external-grpc) include(ExternalProject) list(APPEND CMAKE_ARGS + "-DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH}" "-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}" "-DCMAKE_TOOLCHAIN_FILE:PATH=${CMAKE_TOOLCHAIN_FILE}" - "-DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH}" "-DCMAKE_POSITION_INDEPENDENT_CODE=ON" "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" "-DRUN_HAVE_STD_REGEX=0" diff --git a/third_party/jsoncpp/CMakeLists.txt b/third_party/jsoncpp/CMakeLists.txt index e8cff6a8a6..9f4b5ce401 100644 --- a/third_party/jsoncpp/CMakeLists.txt +++ b/third_party/jsoncpp/CMakeLists.txt @@ -4,6 +4,7 @@ project(external-jsoncpp) include(ExternalProject) list(APPEND CMAKE_ARGS + "-DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH}" "-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}" "-DCMAKE_TOOLCHAIN_FILE:PATH=${CMAKE_TOOLCHAIN_FILE}" "-DCMAKE_POSITION_INDEPENDENT_CODE=ON" diff --git a/third_party/mavlink/CMakeLists.txt b/third_party/mavlink/CMakeLists.txt index 132aa3866d..a8642fb694 100644 --- a/third_party/mavlink/CMakeLists.txt +++ b/third_party/mavlink/CMakeLists.txt @@ -4,6 +4,7 @@ project(external-mavlink) include(ExternalProject) list(APPEND CMAKE_ARGS + "-DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH}" "-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}" "-DCMAKE_TOOLCHAIN_FILE:PATH=${CMAKE_TOOLCHAIN_FILE}" "-DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH}" diff --git a/third_party/protobuf/CMakeLists.txt b/third_party/protobuf/CMakeLists.txt index 04ada7deb7..261f1bd85e 100644 --- a/third_party/protobuf/CMakeLists.txt +++ b/third_party/protobuf/CMakeLists.txt @@ -4,9 +4,9 @@ project(external-protobuf) include(ExternalProject) list(APPEND CMAKE_ARGS + "-DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH}" "-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}" "-DCMAKE_TOOLCHAIN_FILE:PATH=${CMAKE_TOOLCHAIN_FILE}" - "-DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH}" "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" "-Dprotobuf_BUILD_TESTS=OFF" "-Dprotobuf_BUILD_SHARED_LIBS=OFF" diff --git a/third_party/tinyxml2/CMakeLists.txt b/third_party/tinyxml2/CMakeLists.txt index dd9013c394..65de00d9d2 100644 --- a/third_party/tinyxml2/CMakeLists.txt +++ b/third_party/tinyxml2/CMakeLists.txt @@ -4,6 +4,7 @@ project(external-tinyxml2) include(ExternalProject) list(APPEND CMAKE_ARGS + "-DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH}" "-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}" "-DCMAKE_TOOLCHAIN_FILE:PATH=${CMAKE_TOOLCHAIN_FILE}" "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" diff --git a/third_party/zlib/CMakeLists.txt b/third_party/zlib/CMakeLists.txt index d75d06f359..d8d5a051be 100644 --- a/third_party/zlib/CMakeLists.txt +++ b/third_party/zlib/CMakeLists.txt @@ -4,6 +4,7 @@ project(external-zlib) include(ExternalProject) list(APPEND CMAKE_ARGS + "-DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH}" "-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}" "-DCMAKE_TOOLCHAIN_FILE:PATH=${CMAKE_TOOLCHAIN_FILE}" "-DCMAKE_POSITION_INDEPENDENT_CODE=ON" From 3dc63b18bea11630d6786bb004a704a6ab1499d3 Mon Sep 17 00:00:00 2001 From: Jonas Vautherin Date: Wed, 1 Jun 2022 19:12:46 +0200 Subject: [PATCH 2/2] Add Ubuntu 22.04 to CI --- .github/workflows/main.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 03209bf071..e79f719a4e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -72,9 +72,12 @@ jobs: - name: system tests run: ./build/release/src/system_tests/system_tests_runner - ubuntu20-superbuild: - name: ubuntu-20.04 (mavsdk_server, superbuild) - runs-on: ubuntu-20.04 + ubuntu-superbuild: + name: ${{ matrix.ubuntu_image }} (mavsdk_server, superbuild) + runs-on: ${{ matrix.ubuntu_image }} + strategy: + matrix: + ubuntu_image: [ubuntu-20.04, ubuntu-22.04] steps: - uses: actions/checkout@v2 with: