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

MNT: rerender and enable windows tests #38

Merged
merged 14 commits into from
May 19, 2023
4 changes: 2 additions & 2 deletions .azure-pipelines/azure-pipelines-win.yml

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

12 changes: 6 additions & 6 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
assimp:
- 5.2.5
boost_cpp:
- 1.78.0
c_compiler:
- gcc
c_compiler_version:
- '11'
- '12'
cdt_name:
- cos6
channel_sources:
Expand All @@ -17,18 +15,20 @@ console_bridge:
cxx_compiler:
- gxx
cxx_compiler_version:
- '11'
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
flann:
- 1.9.1
fmt:
- '9'
lz4_c:
- 1.9.3
pin_run_as_build:
boost-cpp:
max_pin: x.x.x
flann:
max_pin: x.x.x
spdlog:
- '1.11'
target_platform:
- linux-64
tinyxml2:
Expand Down
12 changes: 6 additions & 6 deletions .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@ BUILD:
- aarch64-conda_cos7-linux-gnu
assimp:
- 5.2.5
boost_cpp:
- 1.78.0
c_compiler:
- gcc
c_compiler_version:
- '11'
- '12'
cdt_arch:
- aarch64
cdt_name:
Expand All @@ -21,18 +19,20 @@ console_bridge:
cxx_compiler:
- gxx
cxx_compiler_version:
- '11'
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
flann:
- 1.9.1
fmt:
- '9'
lz4_c:
- 1.9.3
pin_run_as_build:
boost-cpp:
max_pin: x.x.x
flann:
max_pin: x.x.x
spdlog:
- '1.11'
target_platform:
- linux-aarch64
tinyxml2:
Expand Down
12 changes: 6 additions & 6 deletions .ci_support/linux_ppc64le_.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
assimp:
- 5.2.5
boost_cpp:
- 1.78.0
c_compiler:
- gcc
c_compiler_version:
- '11'
- '12'
cdt_name:
- cos7
channel_sources:
Expand All @@ -17,18 +15,20 @@ console_bridge:
cxx_compiler:
- gxx
cxx_compiler_version:
- '11'
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
flann:
- 1.9.1
fmt:
- '9'
lz4_c:
- 1.9.3
pin_run_as_build:
boost-cpp:
max_pin: x.x.x
flann:
max_pin: x.x.x
spdlog:
- '1.11'
target_platform:
- linux-ppc64le
tinyxml2:
Expand Down
7 changes: 0 additions & 7 deletions .ci_support/migrations/assimp525.yaml

This file was deleted.

12 changes: 6 additions & 6 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@ MACOSX_DEPLOYMENT_TARGET:
- '10.9'
assimp:
- 5.2.5
boost_cpp:
- 1.78.0
c_compiler:
- clang
c_compiler_version:
- '14'
- '15'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -17,18 +15,20 @@ console_bridge:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '14'
- '15'
flann:
- 1.9.1
fmt:
- '9'
lz4_c:
- 1.9.3
macos_machine:
- x86_64-apple-darwin13.4.0
pin_run_as_build:
boost-cpp:
max_pin: x.x.x
flann:
max_pin: x.x.x
spdlog:
- '1.11'
target_platform:
- osx-64
tinyxml2:
Expand Down
12 changes: 6 additions & 6 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@ MACOSX_DEPLOYMENT_TARGET:
- '11.0'
assimp:
- 5.2.5
boost_cpp:
- 1.78.0
c_compiler:
- clang
c_compiler_version:
- '14'
- '15'
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -17,18 +15,20 @@ console_bridge:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '14'
- '15'
flann:
- 1.9.1
fmt:
- '9'
lz4_c:
- 1.9.3
macos_machine:
- arm64-apple-darwin20.0.0
pin_run_as_build:
boost-cpp:
max_pin: x.x.x
flann:
max_pin: x.x.x
spdlog:
- '1.11'
target_platform:
- osx-arm64
tinyxml2:
Expand Down
8 changes: 4 additions & 4 deletions .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
assimp:
- 5.2.5
boost_cpp:
- 1.78.0
c_compiler:
- vs2019
channel_sources:
Expand All @@ -14,15 +12,17 @@ cxx_compiler:
- vs2019
flann:
- 1.9.1
fmt:
- '9'
lz4_c:
- 1.9.3
perl:
- 5.32.1
pin_run_as_build:
boost-cpp:
max_pin: x.x.x
flann:
max_pin: x.x.x
spdlog:
- '1.11'
target_platform:
- win-64
tinyxml2:
Expand Down
4 changes: 2 additions & 2 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_osx_build.sh

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

8 changes: 4 additions & 4 deletions README.md

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

14 changes: 6 additions & 8 deletions recipe/bld.bat
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,20 @@ cmake -G "Ninja" ^
-DBUILD_TESTING:BOOL=ON ^
-DASSIMP_AISCENE_CTOR_DTOR_DEFINED:BOOL=ON ^
-DASSIMP_AIMATERIAL_CTOR_DTOR_DEFINED:BOOL=ON ^
-DDART_TREAT_WARNINGS_AS_ERRORS:BOOL=OFF ^
%SRC_DIR%

echo "Print CMakeOutput:"
type CMakeFiles\CMakeOutput.log
echo "Print CMakeOutput:"
type CMakeFiles\CMakeError.log
if errorlevel 1 exit 1

:: Use 3 core to try to avoid out of memory errors
:: Use 2 core to try to avoid out of memory errors
:: See https://github.com/conda-forge/dartsim-feedstock/pull/27#issuecomment-1132570816 (where it was reduced to 4)
:: and https://github.com/conda-forge/dartsim-feedstock/pull/30#issuecomment-1149743621 (where it was reduced to 3)
ninja -j 3
:: and https://github.com/conda-forge/dartsim-feedstock/pull/38#issuecomment-1553091093 (where it was reduced to 2)
ninja -j 2
if errorlevel 1 exit 1

ninja install
if errorlevel 1 exit 1

ctest --output-on-failure
:: https://github.com/conda-forge/dartsim-feedstock/issues/39
ctest -E "test_Collision" --output-on-failure
if errorlevel 1 exit 1
1 change: 1 addition & 0 deletions recipe/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ cmake ${CMAKE_ARGS} $SRC_DIR \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_LIBDIR=lib \
-DDART_VERBOSE:BOOL=ON \
-DDART_TREAT_WARNINGS_AS_ERRORS:BOOL=OFF \
${CMAKE_TEST_CMD}

make ${NUM_PARALLEL}
Expand Down
13 changes: 13 additions & 0 deletions recipe/enable_windows_tests.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt
index a495f25550e8b..81dc08f396063 100644
--- a/unittests/CMakeLists.txt
+++ b/unittests/CMakeLists.txt
@@ -93,7 +93,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
# fixed even after further changes are made
# - "unit": low level tests for one or few classes and functions to verify that
# they performs correctly as expected
-if(NOT MSVC)
+if(TRUE)
# Disabled due to limitied disk space in CI image
add_subdirectory(integration)
add_subdirectory(regression)
3 changes: 2 additions & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@ source:
- disable_imgui.patch
- disable_gui.patch
- disable_test_Issue1596.patch
- enable_windows_tests.patch

build:
number: 0
number: 1
run_exports:
- {{ pin_subpackage(name, max_pin='x.x') }}

Expand Down