From 061965f69be7077c2ec3732ef4ef6b07f1a8cf06 Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Mon, 27 Jul 2020 10:52:26 -0700 Subject: [PATCH] Bump to SDFormat 10 for Dome (#85) Signed-off-by: Louise Poubel --- .github/workflows/ci-bionic.yml | 15 ++++++++++++++- CMakeLists.txt | 2 +- bitbucket-pipelines.yml | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-bionic.yml b/.github/workflows/ci-bionic.yml index 60310aa20..400e34815 100644 --- a/.github/workflows/ci-bionic.yml +++ b/.github/workflows/ci-bionic.yml @@ -13,5 +13,18 @@ jobs: id: ci uses: ignition-tooling/ubuntu-bionic-ci-action@master with: - apt-dependencies: 'software-properties-common libignition-cmake2-dev libignition-common3-dev libignition-math6-dev libignition-math6-eigen3-dev libignition-plugin-dev libeigen3-dev dart6-data libdart6-collision-ode-dev libdart6-dev libdart6-utils-urdf-dev libbenchmark-dev libsdformat9-dev' + apt-dependencies: | + dart6-data + libbenchmark-dev + libdart6-collision-ode-dev + libdart6-dev + libdart6-utils-urdf-dev + libeigen3-dev + libignition-cmake2-dev + libignition-common3-dev + libignition-math6-dev + libignition-math6-eigen3-dev + libignition-plugin-dev + libsdformat10-dev + software-properties-common codecov-token: ${{ secrets.CODECOV_TOKEN }} diff --git a/CMakeLists.txt b/CMakeLists.txt index a52f09441..0095de5e7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,7 +56,7 @@ ign_find_package(EIGEN3 REQUIRED) #-------------------------------------- # Find SDFormat for the SDF features -ign_find_package(sdformat9 REQUIRED_BY sdf dartsim tpe) +ign_find_package(sdformat10 REQUIRED_BY sdf dartsim tpe) #-------------------------------------- # Find dartsim for the dartsim plugin wrapper diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index 2d45a578f..7d3439b03 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -35,7 +35,7 @@ pipelines: libdart6-dev libdart6-utils-urdf-dev libbenchmark-dev - libsdformat9-dev + libsdformat10-dev # libsdformat (uncomment if a specific branch is needed) #- apt install -y # libtinyxml-dev