Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[bot-automerge] gz-physics v8.0.0 #41

Merged
merged 8 commits into from
Sep 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .scripts/build_steps.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .scripts/run_win_build.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 13 additions & 13 deletions README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build-locally.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions conda-forge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ azure:
bot:
abi_migration_branches:
- v6
- v7
automerge: true
build_platform:
osx_arm64: osx_64
Expand Down
12 changes: 10 additions & 2 deletions recipe/build_cxx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,21 @@ if [[ "${target_platform}" == osx-* ]]; then
CXXFLAGS="${CXXFLAGS} -D_LIBCPP_DISABLE_AVAILABILITY"
fi

if [[ "${CONDA_BUILD_CROSS_COMPILATION:-}" != "1" || "${CROSSCOMPILING_EMULATOR}" != "" ]]; then
GZ_PHYSICS_BUILD_TESTING="OFF"
else
GZ_PHYSICS_BUILD_TESTING="ON"
fi

mkdir build
cd build

cmake ${CMAKE_ARGS} .. \
-G "Ninja" \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=True \
-DGZ_ENABLE_RELOCATABLE_INSTALL:BOOL=ON
-DGZ_ENABLE_RELOCATABLE_INSTALL:BOOL=ON \
-DBUILD_TESTING=$GZ_PHYSICS_BUILD_TESTING

cmake --build . --config Release ${NUM_PARALLEL}
cmake --build . --config Release --target install ${NUM_PARALLEL}
Expand All @@ -23,7 +30,8 @@ if [ ${target_platform} != "linux-ppc64le" ]; then
# Remove test INTEGRATION_ExamplesBuild_TEST that fails on multiple platforms: https://github.com/conda-forge/libignition-physics-feedstock/pull/14
# Remove COMMON_TEST_simulation_features_dartsim that fails on aarch64 https://github.com/conda-forge/gz-physics-feedstock/issues/15
# Remove COMMON_TEST_joint_mimic_features_bullet-featherstone due to https://github.com/conda-forge/gz-physics-feedstock/pull/16#issuecomment-1753235252
# Remove COMMON_TEST_simulation_features_bullet-featherstone due to https://github.com/conda-forge/gz-physics-feedstock/issues/46
if [[ "${CONDA_BUILD_CROSS_COMPILATION:-}" != "1" || "${CROSSCOMPILING_EMULATOR}" != "" ]]; then
ctest --output-on-failure -C Release -E "INTEGRATION_FrameSemantics2d|INTEGRATION_JointTypes2f|UNIT_Collisions_TEST|UNIT_EntityManagement_TEST|UNIT_JointFeatures_TEST|UNIT_LinkFeatures_TEST|UNIT_SDFFeatures_TEST|UNIT_SimulationFeatures_TEST|INTEGRATION_ExamplesBuild_TEST|UNIT_WorldFeatures_TEST|UNIT_ShapeFeatures_TEST|UNIT_FreeGroupFeatures_TEST|UNIT_KinematicsFeatures_TEST|PERFORMANCE|UNIT_AddedMassFeatures_TEST|COMMON_TEST_simulation_features_dartsim|COMMON_TEST_joint_mimic_features_bullet-featherstone"
ctest --output-on-failure -C Release -E "INTEGRATION_FrameSemantics2d|INTEGRATION_JointTypes2f|UNIT_Collisions_TEST|UNIT_EntityManagement_TEST|UNIT_JointFeatures_TEST|UNIT_LinkFeatures_TEST|UNIT_SDFFeatures_TEST|UNIT_SimulationFeatures_TEST|INTEGRATION_ExamplesBuild_TEST|UNIT_WorldFeatures_TEST|UNIT_ShapeFeatures_TEST|UNIT_FreeGroupFeatures_TEST|UNIT_KinematicsFeatures_TEST|PERFORMANCE|UNIT_AddedMassFeatures_TEST|COMMON_TEST_simulation_features_dartsim|COMMON_TEST_joint_mimic_features_bullet-featherstone|COMMON_TEST_simulation_features_bullet-featherstone"
fi
fi
23 changes: 23 additions & 0 deletions recipe/disable_common_test.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
From 28e4f01366d39b4826274cdc573b01b0b7cd00ca Mon Sep 17 00:00:00 2001
From: Silvio Traversaro <[email protected]>
Date: Mon, 30 Sep 2024 12:35:13 +0200
Subject: [PATCH] Update CMakeLists.txt

Signed-off-by: Silvio Traversaro <[email protected]>
---
test/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 47dbfe30f..a1197a4bb 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -32,7 +32,7 @@ target_link_libraries(gz-physics-test INTERFACE

add_subdirectory(gtest_vendor)
add_subdirectory(benchmark)
-add_subdirectory(common_test)
+#add_subdirectory(common_test)
add_subdirectory(plugins)
add_subdirectory(integration)
add_subdirectory(performance)
15 changes: 8 additions & 7 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% set component_name = "physics" %}
{% set repo_name = "gz-" + component_name %}
{% set version = "7.3.0" %}
{% set version = "8.0.0" %}
{% set major_version = version.split('.')[0] %}
{% set name = repo_name + major_version %}
{% set component_version = component_name + major_version %}
Expand All @@ -12,11 +12,12 @@ package:

source:
- url: https://github.com/gazebosim/{{ repo_name }}/archive/{{ repo_name }}{{ major_version }}_{{ version }}.tar.gz
sha256: 4da34f55ba8a45b56b91f47803e7166edd6555eff7924b50763d87736475846b
sha256: 58ecf05966c901ff09d378e2ab151de40bc0a5e6a46fe25989730ce13c5cbf56
patches:
- disable_fake_install.patch
- disable_integration_tests.patch # [win]
- workaround_win_base_test.patch # [win]
- disable_common_test.patch # [arm64]

build:
number: 0
Expand All @@ -37,12 +38,12 @@ outputs:
- cmake
- pkg-config
host:
- libgz-cmake3
- libgz-plugin2
- libgz-math7
- libgz-common5
- libgz-cmake4
- libgz-plugin3
- libgz-math8
- libgz-common6
- libgz-utils2
- libsdformat14
- libsdformat15
- eigen
- assimp
- dartsim-cpp
Expand Down