From 798c6579618fc52f2fc61e39ef5c72ba63559a5a Mon Sep 17 00:00:00 2001 From: Pierre Gergondet Date: Tue, 8 Sep 2020 18:37:06 +0800 Subject: [PATCH] Release v1.1.1 - Add operator*= and operator/= to ForceVec and MotionVec - Fix warnings in MSVC --- .github/workflows/package.yml | 2 ++ CMakeLists.txt | 2 +- conanfile.py | 2 +- debian/changelog | 6 ++++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 3326cc7..682f6ca 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -33,6 +33,8 @@ jobs: grep -q "set(PROJECT_VERSION ${VERSION})" CMakeLists.txt echo "::set-env name=REJECTION::Upstream version in debian/changelog does not match tag" head -n 1 debian/changelog | grep -q "spacevecalg (${VERSION}" + echo "::set-env name=REJECTION::Conan package version does not match tag" + 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 b63dcce..1baec86 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON) set(PROJECT_NAME SpaceVecAlg) set(PROJECT_DESCRIPTION "Implementation of spatial vector algebra with the Eigen3 linear algebra library.") set(PROJECT_URL "https://github.com/jrl-umi3218/SpaceVecAlg") -set(PROJECT_VERSION 1.1.0) +set(PROJECT_VERSION 1.1.1) set(PROJECT_USE_CMAKE_EXPORT TRUE) include(cmake/base.cmake) diff --git a/conanfile.py b/conanfile.py index 67f3d12..28d7644 100644 --- a/conanfile.py +++ b/conanfile.py @@ -14,7 +14,7 @@ class SpaceVecAlgConan(base.Eigen3ToPythonConan): name = "SpaceVecAlg" - version = "1.1.0" + version = "1.1.1" description = "Spatial Vector Algebra with the Eigen library" topics = ("robotics", "algebra", "eigen", "python") url = "https://github.com/jrl-umi3218/SpaceVecAlg" diff --git a/debian/changelog b/debian/changelog index 975c308..a5eaeac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +spacevecalg (1.1.1-1ubuntu1) unstable; urgency=medium + + * New upstream release + + -- Pierre Gergondet Tue, 08 Sep 2020 18:36:49 +0800 + spacevecalg (1.1.0-1ubuntu1) unstable; urgency=medium * Match current upstream version