Skip to content

Commit

Permalink
Rebuild for assimp 5.4.3 (#230)
Browse files Browse the repository at this point in the history 
automerged PR by conda-forge/automerge-action
  • Loading branch information
@github-actions
github-actions[bot] authored Oct 1, 2024
2 parents f04c127 + b619a62 commit 4ce7d9a
Show file tree
Hide file tree
Showing 25 changed files with 50 additions and 43 deletions.
4 changes: 2 additions & 2 deletions .ci_support/linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GZ_CLI_NAME_VARIANT:
- gzcompatname
assimp:
- 5.4.2
- 5.4.3
bullet_cpp:
- '3.25'
c_compiler:
Expand Down Expand Up @@ -51,7 +51,7 @@ libprotobuf:
libuuid:
- '2'
libxcb:
- '1.16'
- '1'
qt_main:
- '5.15'
target_platform:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GZ_CLI_NAME_VARIANT:
- gzcompatname
assimp:
- 5.4.2
- 5.4.3
bullet_cpp:
- '3.25'
c_compiler:
Expand Down Expand Up @@ -51,7 +51,7 @@ libprotobuf:
libuuid:
- '2'
libxcb:
- '1.16'
- '1'
qt_main:
- '5.15'
target_platform:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GZ_CLI_NAME_VARIANT:
- origname
assimp:
- 5.4.2
- 5.4.3
bullet_cpp:
- '3.25'
c_compiler:
Expand Down Expand Up @@ -51,7 +51,7 @@ libprotobuf:
libuuid:
- '2'
libxcb:
- '1.16'
- '1'
qt_main:
- '5.15'
target_platform:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GZ_CLI_NAME_VARIANT:
- origname
assimp:
- 5.4.2
- 5.4.3
bullet_cpp:
- '3.25'
c_compiler:
Expand Down Expand Up @@ -51,7 +51,7 @@ libprotobuf:
libuuid:
- '2'
libxcb:
- '1.16'
- '1'
qt_main:
- '5.15'
target_platform:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ BUILD:
GZ_CLI_NAME_VARIANT:
- gzcompatname
assimp:
- 5.4.2
- 5.4.3
bullet_cpp:
- '3.25'
c_compiler:
Expand Down Expand Up @@ -55,7 +55,7 @@ libprotobuf:
libuuid:
- '2'
libxcb:
- '1.16'
- '1'
qt_main:
- '5.15'
target_platform:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ BUILD:
GZ_CLI_NAME_VARIANT:
- gzcompatname
assimp:
- 5.4.2
- 5.4.3
bullet_cpp:
- '3.25'
c_compiler:
Expand Down Expand Up @@ -55,7 +55,7 @@ libprotobuf:
libuuid:
- '2'
libxcb:
- '1.16'
- '1'
qt_main:
- '5.15'
target_platform:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ BUILD:
GZ_CLI_NAME_VARIANT:
- origname
assimp:
- 5.4.2
- 5.4.3
bullet_cpp:
- '3.25'
c_compiler:
Expand Down Expand Up @@ -55,7 +55,7 @@ libprotobuf:
libuuid:
- '2'
libxcb:
- '1.16'
- '1'
qt_main:
- '5.15'
target_platform:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ BUILD:
GZ_CLI_NAME_VARIANT:
- origname
assimp:
- 5.4.2
- 5.4.3
bullet_cpp:
- '3.25'
c_compiler:
Expand Down Expand Up @@ -55,7 +55,7 @@ libprotobuf:
libuuid:
- '2'
libxcb:
- '1.16'
- '1'
qt_main:
- '5.15'
target_platform:
Expand Down
8 changes: 8 additions & 0 deletions .ci_support/migrations/assimp543.yaml
View file
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
4 changes: 2 additions & 2 deletions .ci_support/osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ MACOSX_DEPLOYMENT_TARGET:
MACOSX_SDK_VERSION:
- '10.15'
assimp:
- 5.4.2
- 5.4.3
bullet_cpp:
- '3.25'
bzip2:
Expand Down Expand Up @@ -51,7 +51,7 @@ libode:
libprotobuf:
- 4.25.3
libxcb:
- '1.16'
- '1'
macos_machine:
- x86_64-apple-darwin13.4.0
macos_min_version:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ MACOSX_DEPLOYMENT_TARGET:
MACOSX_SDK_VERSION:
- '10.15'
assimp:
- 5.4.2
- 5.4.3
bullet_cpp:
- '3.25'
bzip2:
Expand Down Expand Up @@ -51,7 +51,7 @@ libode:
libprotobuf:
- 4.25.3
libxcb:
- '1.16'
- '1'
macos_machine:
- x86_64-apple-darwin13.4.0
macos_min_version:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ MACOSX_DEPLOYMENT_TARGET:
MACOSX_SDK_VERSION:
- '10.15'
assimp:
- 5.4.2
- 5.4.3
bullet_cpp:
- '3.25'
bzip2:
Expand Down Expand Up @@ -51,7 +51,7 @@ libode:
libprotobuf:
- 4.25.3
libxcb:
- '1.16'
- '1'
macos_machine:
- x86_64-apple-darwin13.4.0
macos_min_version:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ MACOSX_DEPLOYMENT_TARGET:
MACOSX_SDK_VERSION:
- '10.15'
assimp:
- 5.4.2
- 5.4.3
bullet_cpp:
- '3.25'
bzip2:
Expand Down Expand Up @@ -51,7 +51,7 @@ libode:
libprotobuf:
- 4.25.3
libxcb:
- '1.16'
- '1'
macos_machine:
- x86_64-apple-darwin13.4.0
macos_min_version:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ MACOSX_DEPLOYMENT_TARGET:
MACOSX_SDK_VERSION:
- '11.0'
assimp:
- 5.4.2
- 5.4.3
bullet_cpp:
- '3.25'
bzip2:
Expand Down Expand Up @@ -51,7 +51,7 @@ libode:
libprotobuf:
- 4.25.3
libxcb:
- '1.16'
- '1'
macos_machine:
- arm64-apple-darwin20.0.0
qt_main:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ MACOSX_DEPLOYMENT_TARGET:
MACOSX_SDK_VERSION:
- '11.0'
assimp:
- 5.4.2
- 5.4.3
bullet_cpp:
- '3.25'
bzip2:
Expand Down Expand Up @@ -51,7 +51,7 @@ libode:
libprotobuf:
- 4.25.3
libxcb:
- '1.16'
- '1'
macos_machine:
- arm64-apple-darwin20.0.0
qt_main:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ MACOSX_DEPLOYMENT_TARGET:
MACOSX_SDK_VERSION:
- '11.0'
assimp:
- 5.4.2
- 5.4.3
bullet_cpp:
- '3.25'
bzip2:
Expand Down Expand Up @@ -51,7 +51,7 @@ libode:
libprotobuf:
- 4.25.3
libxcb:
- '1.16'
- '1'
macos_machine:
- arm64-apple-darwin20.0.0
qt_main:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ MACOSX_DEPLOYMENT_TARGET:
MACOSX_SDK_VERSION:
- '11.0'
assimp:
- 5.4.2
- 5.4.3
bullet_cpp:
- '3.25'
bzip2:
Expand Down Expand Up @@ -51,7 +51,7 @@ libode:
libprotobuf:
- 4.25.3
libxcb:
- '1.16'
- '1'
macos_machine:
- arm64-apple-darwin20.0.0
qt_main:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GZ_CLI_NAME_VARIANT:
- gzcompatname
assimp:
- 5.4.2
- 5.4.3
c_compiler:
- vs2019
c_stdlib:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GZ_CLI_NAME_VARIANT:
- gzcompatname
assimp:
- 5.4.2
- 5.4.3
c_compiler:
- vs2019
c_stdlib:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GZ_CLI_NAME_VARIANT:
- origname
assimp:
- 5.4.2
- 5.4.3
c_compiler:
- vs2019
c_stdlib:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GZ_CLI_NAME_VARIANT:
- origname
assimp:
- 5.4.2
- 5.4.3
c_compiler:
- vs2019
c_stdlib:
Expand Down
5 changes: 2 additions & 3 deletions .scripts/build_steps.sh
View file

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
View file

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
View file

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
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% set name = "gazebo" %}
{% set version = "11.14.0" %}
{% set build_number = 18 %}
{% set build_number = 19 %}

{% if GZ_CLI_NAME_VARIANT == "origname" %}
{% set build_number = build_number + 200 %}
Expand Down

0 comments on commit 4ce7d9a

Please sign in to comment.