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

Bump to potentially fix https://github.com/conda-forge/gz-sim-feedstock/pull/9, fix autotick bot #7

Merged
merged 42 commits into from
Jun 8, 2023
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
44bb10f
Bump
Tobias-Fischer Jan 22, 2023
68ebeff
MNT: Re-rendered with conda-build 3.23.3, conda-smithy 3.22.1, and co…
Jan 22, 2023
d0b0fe6
Bump to 6.2.0
Tobias-Fischer Jan 22, 2023
2a1dd46
Create 465.patch
traversaro Jan 22, 2023
f7e6b73
Update meta.yaml
traversaro Jan 22, 2023
581bd7c
sha fix
Tobias-Fischer Jan 22, 2023
b13de5e
Update meta.yaml
traversaro Jan 22, 2023
1d7f6f2
Delete 465.patch
traversaro Jan 22, 2023
84b8798
Compiler running out of heap space, try fewer threads
Tobias-Fischer Jan 23, 2023
17f85f5
Fix autotick bot
traversaro Feb 6, 2023
62fd825
Update meta.yaml
traversaro Feb 6, 2023
b55f663
Update meta.yaml
traversaro Feb 6, 2023
f94df77
Update meta.yaml
traversaro Feb 6, 2023
a01fb4e
Update bld_cxx.bat
traversaro Feb 7, 2023
0cd6e1d
Update bld_cxx.bat
traversaro Mar 3, 2023
8c0fe71
Update meta.yaml
traversaro Mar 3, 2023
9d245fb
Update build_cxx.sh
traversaro Mar 3, 2023
3260fdf
MNT: Re-rendered with conda-build 3.23.3, conda-smithy 3.23.0, and co…
Mar 3, 2023
d94ec77
Update disable_integration_tests.patch
traversaro Mar 3, 2023
53d9763
Update bld_cxx.bat
traversaro Mar 3, 2023
f7dc4be
Update bld_cxx.bat
traversaro Mar 5, 2023
1963229
Update meta.yaml
traversaro Mar 5, 2023
b96277b
Update meta.yaml
traversaro May 14, 2023
8d9cbb6
MNT: Re-rendered with conda-build 3.24.0, conda-smithy 3.23.1, and co…
May 14, 2023
3e4fcf5
Update meta.yaml
traversaro May 14, 2023
0249908
Update bld_cxx.bat
traversaro May 20, 2023
debc266
Update meta.yaml
traversaro May 20, 2023
9fd2a27
Update meta.yaml
traversaro Jun 7, 2023
d877c8c
Update meta.yaml
traversaro Jun 7, 2023
1984d62
Create conda_build_config.yaml
traversaro Jun 7, 2023
8cd030f
MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.23.1, and co…
Jun 7, 2023
0225cd1
Update conda-forge.yml
traversaro Jun 7, 2023
165bd5b
Create workaround_win_base_test.patch
traversaro Jun 7, 2023
dcbb67c
Update meta.yaml
traversaro Jun 7, 2023
14aeae4
Delete conda_build_config.yaml
traversaro Jun 7, 2023
e398b7d
Update conda-forge.yml
traversaro Jun 7, 2023
895d879
MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.23.1, and co…
Jun 7, 2023
4d8b54c
Create conda_build_config.yaml
traversaro Jun 7, 2023
4689a01
MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.23.1, and co…
Jun 7, 2023
e6bff35
Update bld_cxx.bat
traversaro Jun 8, 2023
c1a7394
Delete conda_build_config.yaml
traversaro Jun 8, 2023
eb549bd
MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.23.1, and co…
Jun 8, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .azure-pipelines/azure-pipelines-win.yml

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_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ assimp:
c_compiler:
- gcc
c_compiler_version:
- '10'
- '11'
cdt_name:
- cos6
channel_sources:
Expand All @@ -13,7 +13,7 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '10'
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
target_platform:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ assimp:
c_compiler:
- gcc
c_compiler_version:
- '10'
- '11'
cdt_arch:
- aarch64
cdt_name:
Expand All @@ -17,7 +17,7 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '10'
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-aarch64
target_platform:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_ppc64le_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ assimp:
c_compiler:
- gcc
c_compiler_version:
- '10'
- '11'
cdt_name:
- cos7
channel_sources:
Expand All @@ -13,7 +13,7 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '10'
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-ppc64le
target_platform:
Expand Down
7 changes: 0 additions & 7 deletions .ci_support/migrations/assimp525.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion recipe/bld_cxx.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cmake ^
if errorlevel 1 exit 1

:: Build.
cmake --build . --config Release
cmake --build . --config Release --parallel 2
if errorlevel 1 exit 1

:: Install.
Expand Down
15 changes: 8 additions & 7 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
{% set component_name = "physics" %}
{% set repo_name = "gz-" + component_name %}
{% set version = "6.0.0" %}
{% set major_version = version.split('.')[0] %}
{% set version = "6_6.3.0" %}
{% set major_version = version.split('_')[0] %}
{% set version_package = version.split('_')[1] %}
{% set name = repo_name + major_version %}
{% set component_version = component_name + major_version %}
{% set cxx_name = "lib" + name %}

package:
name: {{ name }}
version: {{ version }}
version: {{ version_package }}

source:
- url: https://github.com/gazebosim/{{ repo_name }}/archive/{{ repo_name }}{{ major_version }}_{{ version }}.tar.gz
sha256: 804d3f031e5daedb7726de82415d6d4835f94a58f53fe2d14952e86ba1541c1d
- url: https://github.com/gazebosim/{{ repo_name }}/archive/{{ repo_name }}{{ version }}.tar.gz
sha256: b182071624fd13aa2cff6ca4d5c8afaaf2abaca19f664a8db22deac1e57b3ee2
patches:
- disable_fake_install.patch
- disable_integration_tests.patch # [win]

build:
number: 2
number: 0

outputs:
- name: {{ cxx_name }}
Expand All @@ -43,7 +44,7 @@ outputs:
- libsdformat13
- eigen
- assimp
- dartsim
- dartsim 6.12
- libode
- bullet-cpp

Expand Down