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

Rebuild for libabseil 20240116, libgrp 1.61, libprotobuf 4.25.2 #203

4 changes: 2 additions & 2 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ graphviz:
hdf5:
- 1.14.3
libabseil:
- '20230802'
- '20240116'
libblas:
- 3.9 *netlib
libboost_devel:
Expand All @@ -39,7 +39,7 @@ libcurl:
libgdal:
- '3.8'
libprotobuf:
- 4.25.1
- 4.25.2
libuuid:
- '2'
libxcb:
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 @@ -31,7 +31,7 @@ graphviz:
hdf5:
- 1.14.3
libabseil:
- '20230802'
- '20240116'
libblas:
- 3.9 *netlib
libboost_devel:
Expand All @@ -43,7 +43,7 @@ libcurl:
libgdal:
- '3.8'
libprotobuf:
- 4.25.1
- 4.25.2
libuuid:
- '2'
libxcb:
Expand Down
7 changes: 0 additions & 7 deletions .ci_support/migrations/hdf51142.yaml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
__migrator:
build_number: 1
commit_message: Rebuild for libabseil 20240116, libgrp 1.61, libprotobuf 4.25.2
kind: version
migration_number: 1
exclude:
- abseil-cpp
- grpc-cpp
- libprotobuf
# this shouldn't attempt to modify the python feedstocks
- protobuf
libabseil:
- "20240116"
libgrpc:
- "1.59"
- "1.61"
libprotobuf:
- 4.24.4
- 4.25.2
# already covered by libabseil20230802_libgrpc157_libprotobuf4234,
# which we cannot delete yet, but keep for clarity
MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64]
- "10.13" # [osx and x86_64]
migrator_ts: 1698833751.21557
migrator_ts: 1705991934.9119136
10 changes: 0 additions & 10 deletions .ci_support/migrations/libprotobuf4251.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions .ci_support/migrations/tinyxml210.yaml

This file was deleted.

4 changes: 2 additions & 2 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ graphviz:
hdf5:
- 1.14.3
libabseil:
- '20230802'
- '20240116'
libblas:
- 3.9 *netlib
libboost_devel:
Expand All @@ -39,7 +39,7 @@ libcurl:
libgdal:
- '3.8'
libprotobuf:
- 4.25.1
- 4.25.2
libxcb:
- '1.15'
macos_machine:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ graphviz:
hdf5:
- 1.14.3
libabseil:
- '20230802'
- '20240116'
libblas:
- 3.9 *netlib
libboost_devel:
Expand All @@ -39,7 +39,7 @@ libcurl:
libgdal:
- '3.8'
libprotobuf:
- 4.25.1
- 4.25.2
libxcb:
- '1.15'
macos_machine:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ graphviz:
hdf5:
- 1.14.3
libabseil:
- '20230802'
- '20240116'
libblas:
- 3.9 *netlib
libboost_devel:
Expand All @@ -29,7 +29,7 @@ libcurl:
libgdal:
- '3.8'
libprotobuf:
- 4.25.1
- 4.25.2
pin_run_as_build:
graphviz:
max_pin: x
Expand Down
6 changes: 3 additions & 3 deletions .scripts/build_steps.sh

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

6 changes: 3 additions & 3 deletions .scripts/run_osx_build.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.

5 changes: 3 additions & 2 deletions build-locally.py

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

1 change: 0 additions & 1 deletion conda-forge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ build_platform:
osx_arm64: osx_64
conda_build:
pkg_format: '2'
conda_build_tool: mambabuild
conda_forge_output_validation: true
github:
branch_name: main
Expand Down
7 changes: 4 additions & 3 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ source:
- fix-invisible-meshes.patch

build:
number: 7
number: 8
run_exports:
- {{ pin_subpackage('gazebo', max_pin='x') }}

Expand Down Expand Up @@ -129,8 +129,9 @@ requirements:
- libboost-devel
- tbb-devel
# Add constraint to avoid that old ogre gets installed during migratons,
# see https://github.com/conda-forge/gazebo-feedstock/pull/188/files
- "ogre >=1.10.12[build_number=3]"
# see https://github.com/conda-forge/gazebo-feedstock/pull/188/files and
# https://github.com/conda-forge/gazebo-feedstock/pull/203#issuecomment-1981995139
- "ogre >=1.10.12.1"
- __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.9") }} # [osx and x86_64]

test:
Expand Down