Skip to content

Commit

Permalink
Manually migrate assimp to 5.4.3 (#98)
Browse files Browse the repository at this point in the history
automerged PR by conda-forge/automerge-action
  • Loading branch information
github-actions[bot] authored Sep 27, 2024
2 parents 4cd834c + 7524ec1 commit ff2f50d
Show file tree
Hide file tree
Showing 12 changed files with 20 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
assimp:
- 5.4.2
- 5.4.3
bullet_cpp:
- '3.25'
c_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
BUILD:
- aarch64-conda_cos7-linux-gnu
assimp:
- 5.4.2
- 5.4.3
bullet_cpp:
- '3.25'
c_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
assimp:
- 5.4.2
- 5.4.3
bullet_cpp:
- '3.25'
c_compiler:
Expand Down
8 changes: 8 additions & 0 deletions .ci_support/migrations/assimp543.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
__migrator:
build_number: 1
commit_message: Rebuild for assimp 5.4.3
kind: version
migration_number: 1
assimp:
- 5.4.3
migrator_ts: 1725100349.1005585
8 changes: 0 additions & 8 deletions .ci_support/migrations/nlopt28.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET:
MACOSX_SDK_VERSION:
- '10.15'
assimp:
- 5.4.2
- 5.4.3
bullet_cpp:
- '3.25'
c_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET:
MACOSX_SDK_VERSION:
- '11.0'
assimp:
- 5.4.2
- 5.4.3
bullet_cpp:
- '3.25'
c_compiler:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
assimp:
- 5.4.2
- 5.4.3
bullet_cpp:
- '3.25'
c_compiler:
Expand Down
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.

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.

2 changes: 1 addition & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ source:
- remove-opencl.patch

build:
number: 4
number: 5

outputs:
- name: dartsim-cpp
Expand Down

0 comments on commit ff2f50d

Please sign in to comment.