Skip to content

Commit

Permalink
libsdformat v12.4.0 (#56)
Browse files Browse the repository at this point in the history
* updated v12.4.0

* MNT: Re-rendered with conda-build 3.21.8, conda-smithy 3.19.0, and conda-forge-pinning 2022.03.30.03.10.21

* Update sdformat.patch

* Delete sdformat.patch

* Update meta.yaml

* Set SKIP_usd to true

* Fix header location in tests

* Fixup

* Remove urdf flags in Bld.bat

* Remove unnecessary dependency on console_bridge

* Add ignition-common4 as dep

* Fix include dir on Win

* Update meta.yaml

Co-authored-by: Tobias Fischer <[email protected]>
  • Loading branch information
regro-cf-autotick-bot and Tobias-Fischer authored Apr 4, 2022
1 parent ea0b805 commit 4d9e926
Show file tree
Hide file tree
Showing 24 changed files with 165 additions and 197 deletions.
8 changes: 0 additions & 8 deletions .azure-pipelines/azure-pipelines-linux.yml

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

5 changes: 2 additions & 3 deletions .azure-pipelines/azure-pipelines-win.yml

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

7 changes: 6 additions & 1 deletion .ci_support/README

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

4 changes: 2 additions & 2 deletions .ci_support/linux_64_ruby2.5.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- gcc
c_compiler_version:
- '9'
- '10'
cdt_name:
- cos6
channel_sources:
Expand All @@ -11,7 +11,7 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '9'
- '10'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
ruby:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_64_ruby2.6.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- gcc
c_compiler_version:
- '9'
- '10'
cdt_name:
- cos6
channel_sources:
Expand All @@ -11,7 +11,7 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '9'
- '10'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
ruby:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_aarch64_ruby2.5.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ BUILD:
c_compiler:
- gcc
c_compiler_version:
- '9'
- '10'
cdt_arch:
- aarch64
cdt_name:
Expand All @@ -15,7 +15,7 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '9'
- '10'
docker_image:
- quay.io/condaforge/linux-anvil-aarch64
ruby:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_aarch64_ruby2.6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ BUILD:
c_compiler:
- gcc
c_compiler_version:
- '9'
- '10'
cdt_arch:
- aarch64
cdt_name:
Expand All @@ -15,7 +15,7 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '9'
- '10'
docker_image:
- quay.io/condaforge/linux-anvil-aarch64
ruby:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_ppc64le_ruby2.5.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- gcc
c_compiler_version:
- '9'
- '10'
cdt_name:
- cos7
channel_sources:
Expand All @@ -11,7 +11,7 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '9'
- '10'
docker_image:
- quay.io/condaforge/linux-anvil-ppc64le
ruby:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_ppc64le_ruby2.6.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler:
- gcc
c_compiler_version:
- '9'
- '10'
cdt_name:
- cos7
channel_sources:
Expand All @@ -11,7 +11,7 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '9'
- '10'
docker_image:
- quay.io/condaforge/linux-anvil-ppc64le
ruby:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_64_ruby2.5.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '11'
- '12'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '11'
- '12'
macos_machine:
- x86_64-apple-darwin13.4.0
macos_min_version:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_64_ruby2.6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '11'
- '12'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '11'
- '12'
macos_machine:
- x86_64-apple-darwin13.4.0
macos_min_version:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_arm64_ruby2.5.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '11'
- '12'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '11'
- '12'
macos_machine:
- arm64-apple-darwin20.0.0
ruby:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_arm64_ruby2.6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '11'
- '12'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '11'
- '12'
macos_machine:
- arm64-apple-darwin20.0.0
ruby:
Expand Down
1 change: 1 addition & 0 deletions .gitattributes

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

12 changes: 8 additions & 4 deletions .scripts/build_steps.sh

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

2 changes: 1 addition & 1 deletion .scripts/run_docker_build.sh

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

48 changes: 32 additions & 16 deletions .scripts/run_osx_build.sh

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

Loading

0 comments on commit 4d9e926

Please sign in to comment.