From c37a61e2932c463423e2e0eb09aa79931f5c333e Mon Sep 17 00:00:00 2001 From: Pierre Gergondet Date: Tue, 8 Sep 2020 18:55:23 +0800 Subject: [PATCH] Release v1.3.0 - URDF and YAML generation from rbd::parsers::ParserResult - Improved conan packaging - Allow to compute a jacobian with a given reference body - Fix many warnings --- .github/workflows/conan.yml | 4 ++-- .github/workflows/package.yml | 2 +- .github/workflows/sources/package.yml | 2 +- CMakeLists.txt | 2 +- conanfile.py | 2 +- debian/changelog | 6 ++++++ 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/conan.yml b/.github/workflows/conan.yml index 5be69328..d348779f 100644 --- a/.github/workflows/conan.yml +++ b/.github/workflows/conan.yml @@ -40,11 +40,11 @@ jobs: sync: needs: build runs-on: ubuntu-18.04 - if: github.ref == 'refs/heads/master' || github.event.action == 'conan-master' || github.event.action == 'conan-release' + if: github.ref == 'refs/heads/master' || github.event.action == 'conan-master' || github.event.action == 'conan-release' || startsWith(github.ref, 'refs/tags/') steps: - name: Trigger dependent rebuilds run: | - if [ "${{ github.event.action }}" == "conan-release" ] + if [ "${{ github.event.action }}" == "conan-release" ] || ${{ startsWith(github.ref, 'refs/tags/') }} then export DISPATCH="conan-release" else diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 622065c3..bde6f8d2 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -34,7 +34,7 @@ jobs: echo "::set-env name=REJECTION::Upstream version in debian/changelog does not match tag" head -n 1 debian/changelog | grep -q "rbdyn (${VERSION}" echo "::set-env name=REJECTION::Conan package version does not match tag" - grep -q ' version = "${VERSION}"' conanfile.py + grep -q "version = \"${VERSION}\"" conanfile.py echo "::set-env name=REJECTION::" export TAG=`echo ${{ github.ref }} | sed -e 's@refs/tags/@@'` echo "::set-env name=RELEASE_TAG::${TAG}" diff --git a/.github/workflows/sources/package.yml b/.github/workflows/sources/package.yml index 1c1d59ff..b7fc412f 100644 --- a/.github/workflows/sources/package.yml +++ b/.github/workflows/sources/package.yml @@ -57,7 +57,7 @@ jobs: echo "::set-env name=REJECTION::Upstream version in debian/changelog does not match tag" head -n 1 debian/changelog | grep -q "rbdyn (${VERSION}" echo "::set-env name=REJECTION::Conan package version does not match tag" - grep -q ' version = "${VERSION}"' conanfile.py + grep -q "version = \"${VERSION}\"" conanfile.py echo "::set-env name=REJECTION::" export TAG=`echo ${{ github.ref }} | sed -e 's@refs/tags/@@'` echo "::set-env name=RELEASE_TAG::${TAG}" diff --git a/CMakeLists.txt b/CMakeLists.txt index f0800a47..000b66c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ set(PROJECT_NAME RBDyn) set(PROJECT_DESCRIPTION "...") set(PROJECT_URL "https://github.com/jrl-umi3218/RBDyn") set(PROJECT_DEBUG_POSTFIX "_d") -set(PROJECT_VERSION 1.2.1) +set(PROJECT_VERSION 1.3.0) set(PROJECT_USE_CMAKE_EXPORT TRUE) option(BUILD_RBDYN_PARSERS "Build URDF and YAML parsers" ON) diff --git a/conanfile.py b/conanfile.py index cf3c82c9..e53492b5 100644 --- a/conanfile.py +++ b/conanfile.py @@ -15,7 +15,7 @@ def get_default_options(): class RBDynConan(base.Eigen3ToPythonConan): name = "RBDyn" - version = "1.2.1" + version = "1.3.0" description = "Model the dynamics of rigid body systems" topics = ("robotics", "dynamics", "eigen", "python") url = "https://github.com/jrl-umi3218/RBDyn" diff --git a/debian/changelog b/debian/changelog index 4af0e064..3f6bf6fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +rbdyn (1.3.0-1ubuntu1) unstable; urgency=medium + + * Update upstream version + + -- Pierre Gergondet Tue, 08 Sep 2020 18:54:59 +0800 + rbdyn (1.2.1-1ubuntu1) unstable; urgency=medium * Update upstream version