Skip to content

Commit

Permalink
Imported upstream version '2.4.5' of 'upstream'
Browse files Browse the repository at this point in the history
  • Loading branch information
wxmerkt committed Jul 31, 2024
1 parent f45cc76 commit 715209f
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/conda/conda-env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ dependencies:
- doxygen
- lxml
- pylatexenc
- qhull
- qhull
8 changes: 4 additions & 4 deletions .github/workflows/macos-linux-conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ jobs:
python-version: ["3.8", "3.12"]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive

- uses: conda-incubator/setup-miniconda@v2
- uses: conda-incubator/setup-miniconda@v3
with:
activate-environment: hpp-fcl
auto-update-conda: true
Expand All @@ -30,14 +30,14 @@ jobs:
shell: bash -l {0}
run: |
conda activate hpp-fcl
conda install compilers=1.4.2 -c conda-forge
conda install compilers -c conda-forge
- name: Install cmake and update conda
shell: bash -l {0}
run: |
conda activate hpp-fcl
conda install cmake -c main
conda install llvm-openmp -c conda-forge
conda install llvm-openmp qhull-static -c conda-forge
- name: Build hpp-fcl
shell: bash -l {0}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/windows-conda-clang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
compiler: clang-cl

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
- uses: conda-incubator/setup-miniconda@v2
- uses: conda-incubator/setup-miniconda@v3
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/windows-conda-v142.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
os: windows-2019

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
- uses: conda-incubator/setup-miniconda@v2
- uses: conda-incubator/setup-miniconda@v3
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
with:
Expand Down
2 changes: 2 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
ci:
autoupdate_branch: devel
autofix_prs: false
autoupdate_schedule: quarterly
repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.1.14
Expand Down
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## [Unreleased]

## [2.4.5] - 2024-07-28

### Fixed
- Fix Octomap dependency on ROS

## [2.4.4] - 2024-03-06

## [2.4.3] - 2024-03-06
Expand Down Expand Up @@ -454,7 +459,8 @@ Now Eigen is at the heart of linear algebra computations.
First release


[Unreleased]: https://github.com/humanoid-path-planner/hpp-fcl/compare/v2.4.4...HEAD
[Unreleased]: https://github.com/humanoid-path-planner/hpp-fcl/compare/v2.4.5...HEAD
[2.4.5]: https://github.com/humanoid-path-planner/hpp-fcl/compare/v2.4.4...v2.4.5
[2.4.4]: https://github.com/humanoid-path-planner/hpp-fcl/compare/v2.4.3...v2.4.4
[2.4.3]: https://github.com/humanoid-path-planner/hpp-fcl/compare/v2.4.2...v2.4.3
[2.4.2]: https://github.com/humanoid-path-planner/hpp-fcl/compare/v2.4.1...v2.4.2
Expand Down
4 changes: 2 additions & 2 deletions package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="3">
<name>hpp-fcl</name>
<version>2.4.4</version>
<version>2.4.5</version>
<description>An extension of the Flexible Collision Library.</description>
<!-- The maintainer listed here is for the ROS release to receive emails for the buildfarm.
Please check the repository URL for full list of authors and maintainers. -->
Expand All @@ -28,7 +28,7 @@
<depend>eigen</depend>
<depend>boost</depend>
<depend>assimp</depend>
<depend>octomap</depend>
<depend>liboctomap-dev</depend>
<depend>eigenpy</depend>

<!-- The following tag is recommended by REP-136 -->
Expand Down

0 comments on commit 715209f

Please sign in to comment.