Skip to content

Commit

Permalink
Rebuild for libprotobuf 4.25.3 (#50)
Browse files Browse the repository at this point in the history
automerged PR by conda-forge/automerge-action
  • Loading branch information
github-actions[bot] authored Mar 6, 2024
2 parents 510c7c8 + 9f62cf7 commit aa2a030
Show file tree
Hide file tree
Showing 13 changed files with 41 additions and 27 deletions.
2 changes: 1 addition & 1 deletion .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ docker_image:
libabseil:
- '20240116'
libprotobuf:
- 4.25.2
- 4.25.3
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ docker_image:
libabseil:
- '20240116'
libprotobuf:
- 4.25.2
- 4.25.3
pin_run_as_build:
python:
min_pin: x.x
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ docker_image:
libabseil:
- '20240116'
libprotobuf:
- 4.25.2
- 4.25.3
pin_run_as_build:
python:
min_pin: x.x
Expand Down
23 changes: 23 additions & 0 deletions .ci_support/migrations/libgrpc162_libprotobuf4253.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
__migrator:
build_number: 1
commit_message: Rebuild for libprotobuf 4.25.3
kind: version
migration_number: 1
exclude:
- abseil-cpp
- grpc-cpp
- libprotobuf
- protobuf
libgrpc:
- "1.62"
libprotobuf:
- 4.25.3
# keep abseil bump from libabseil20240116_libgrpc161_libprotobuf4252;
# this ensures that this migration applies also without the previous one
libabseil:
- "20240116"
# 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: 1709522594.9193177
10 changes: 0 additions & 10 deletions .ci_support/migrations/libprotobuf4251.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ cxx_compiler_version:
libabseil:
- '20240116'
libprotobuf:
- 4.25.2
- 4.25.3
macos_machine:
- x86_64-apple-darwin13.4.0
pin_run_as_build:
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 @@ -11,7 +11,7 @@ cxx_compiler_version:
libabseil:
- '20240116'
libprotobuf:
- 4.25.2
- 4.25.3
macos_machine:
- arm64-apple-darwin20.0.0
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ cxx_compiler:
libabseil:
- '20240116'
libprotobuf:
- 4.25.2
- 4.25.3
pin_run_as_build:
python:
min_pin: x.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.

2 changes: 1 addition & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ source:
- patches/0008-create-and-install-CMake-metadata.patch

build:
number: 7
number: 8

requirements:
build:
Expand Down

0 comments on commit aa2a030

Please sign in to comment.