Skip to content

Commit

Permalink
Release v1.1.0
Browse files Browse the repository at this point in the history
* Add support for cone shapes (#30)
* Improve default values for precision and epsilon (#34)
* Add support for cylinder shapes (#35)
* Improve conan support
  • Loading branch information
gergondet committed Sep 8, 2020
1 parent 86fb183 commit c2e7266
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/conan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 "sch-core (${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}"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sources/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 "sch-core (${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}"
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ if (NOT DEFINED PROJECT_DEBUG_POSTFIX)
set(PROJECT_DEBUG_POSTFIX "_d")
endif()

set(PROJECT_VERSION 1.0.3)
set(PROJECT_VERSION 1.1.0)
set(PROJECT_USE_CMAKE_EXPORT TRUE)

include(cmake/base.cmake)
Expand Down
2 changes: 1 addition & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

class SCHCoreConan(ConanFile):
name = "sch-core"
version = "1.0.3"
version = "1.1.0"
description = "Efficient implementation of GJK algorithm for proximity queries (collision detection, distance computations, penetration depths and witness points) between convex shapes."
topics = ("robotics", "collision", "proximity", "convex")
url = "https://github.com/jrl-umi3218/sch-core"
Expand Down
6 changes: 6 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
sch-core (1.1.0-1ubuntu1) unstable; urgency=medium

* Update upstream version

-- Pierre Gergondet <[email protected]> Tue, 08 Sep 2020 19:05:22 +0800

sch-core (1.0.3-1ubuntu1) unstable; urgency=medium

* Fix out-of-bounds access (PR #23)
Expand Down

0 comments on commit c2e7266

Please sign in to comment.