Skip to content

Commit

Permalink
Merge pull request #33 from regro-cf-autotick-bot/rebuild-assimp543-0…
Browse files Browse the repository at this point in the history
…-1_h67a965

Rebuild for assimp 5.4.3
  • Loading branch information
traversaro authored Oct 2, 2024
2 parents 552a92e + 17b83b2 commit c48f417
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 11 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
c_compiler:
- gcc
c_compiler_version:
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
c_compiler:
- gcc
c_compiler_version:
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
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
c_compiler:
- clang
c_compiler_version:
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
c_compiler:
- clang
c_compiler_version:
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
c_compiler:
- vs2019
c_stdlib:
Expand Down
10 changes: 5 additions & 5 deletions conda-forge.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
bot:
automerge: true
build_platform:
linux_aarch64: linux_64
osx_arm64: osx_64
github:
branch_name: main
tooling_branch_name: main
conda_build:
error_overlinking: true
conda_forge_output_validation: true
bot:
automerge: true
github:
branch_name: main
tooling_branch_name: main
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:
sha256: 144d92b92de20bf7e038d36f5f790541df967f7ea9e17a658a0f0e3ede5ef9c0

build:
number: 0
number: 1

outputs:
- name: {{ cxx_name }}
Expand Down

0 comments on commit c48f417

Please sign in to comment.