Skip to content

Commit

Permalink
Merge pull request #109 from regro-cf-autotick-bot/rebuild-libgrpc162…
Browse files Browse the repository at this point in the history
…_libprotobuf4253-0-1_h0b9216

Rebuild for libprotobuf 4.25.3
  • Loading branch information
xhochy authored Mar 7, 2024
2 parents deb04a0 + cd13f96 commit 5355c54
Show file tree
Hide file tree
Showing 38 changed files with 59 additions and 46 deletions.
2 changes: 1 addition & 1 deletion .ci_support/linux_64_numpy1.22python3.10.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libprotobuf:
- 4.25.2
- 4.25.3
numpy:
- '1.22'
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_numpy1.22python3.8.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libprotobuf:
- 4.25.2
- 4.25.3
numpy:
- '1.22'
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libprotobuf:
- 4.25.2
- 4.25.3
numpy:
- '1.22'
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_numpy1.22python3.9.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libprotobuf:
- 4.25.2
- 4.25.3
numpy:
- '1.22'
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_numpy1.23python3.11.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libprotobuf:
- 4.25.2
- 4.25.3
numpy:
- '1.23'
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_numpy1.26python3.12.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libprotobuf:
- 4.25.2
- 4.25.3
numpy:
- '1.26'
pin_run_as_build:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-aarch64
libprotobuf:
- 4.25.2
- 4.25.3
numpy:
- '1.22'
pin_run_as_build:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-aarch64
libprotobuf:
- 4.25.2
- 4.25.3
numpy:
- '1.22'
pin_run_as_build:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-aarch64
libprotobuf:
- 4.25.2
- 4.25.3
numpy:
- '1.22'
pin_run_as_build:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-aarch64
libprotobuf:
- 4.25.2
- 4.25.3
numpy:
- '1.22'
pin_run_as_build:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-aarch64
libprotobuf:
- 4.25.2
- 4.25.3
numpy:
- '1.23'
pin_run_as_build:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-aarch64
libprotobuf:
- 4.25.2
- 4.25.3
numpy:
- '1.26'
pin_run_as_build:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-ppc64le
libprotobuf:
- 4.25.2
- 4.25.3
numpy:
- '1.22'
pin_run_as_build:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-ppc64le
libprotobuf:
- 4.25.2
- 4.25.3
numpy:
- '1.22'
pin_run_as_build:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-ppc64le
libprotobuf:
- 4.25.2
- 4.25.3
numpy:
- '1.22'
pin_run_as_build:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-ppc64le
libprotobuf:
- 4.25.2
- 4.25.3
numpy:
- '1.22'
pin_run_as_build:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-ppc64le
libprotobuf:
- 4.25.2
- 4.25.3
numpy:
- '1.23'
pin_run_as_build:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-ppc64le
libprotobuf:
- 4.25.2
- 4.25.3
numpy:
- '1.26'
pin_run_as_build:
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_numpy1.22python3.10.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cxx_compiler:
cxx_compiler_version:
- '16'
libprotobuf:
- 4.25.2
- 4.25.3
macos_machine:
- x86_64-apple-darwin13.4.0
numpy:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_numpy1.22python3.8.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cxx_compiler:
cxx_compiler_version:
- '16'
libprotobuf:
- 4.25.2
- 4.25.3
macos_machine:
- x86_64-apple-darwin13.4.0
numpy:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cxx_compiler:
cxx_compiler_version:
- '16'
libprotobuf:
- 4.25.2
- 4.25.3
macos_machine:
- x86_64-apple-darwin13.4.0
numpy:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_numpy1.22python3.9.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cxx_compiler:
cxx_compiler_version:
- '16'
libprotobuf:
- 4.25.2
- 4.25.3
macos_machine:
- x86_64-apple-darwin13.4.0
numpy:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_numpy1.23python3.11.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cxx_compiler:
cxx_compiler_version:
- '16'
libprotobuf:
- 4.25.2
- 4.25.3
macos_machine:
- x86_64-apple-darwin13.4.0
numpy:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_numpy1.26python3.12.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cxx_compiler:
cxx_compiler_version:
- '16'
libprotobuf:
- 4.25.2
- 4.25.3
macos_machine:
- x86_64-apple-darwin13.4.0
numpy:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cxx_compiler:
cxx_compiler_version:
- '16'
libprotobuf:
- 4.25.2
- 4.25.3
macos_machine:
- arm64-apple-darwin20.0.0
numpy:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cxx_compiler:
cxx_compiler_version:
- '16'
libprotobuf:
- 4.25.2
- 4.25.3
macos_machine:
- arm64-apple-darwin20.0.0
numpy:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cxx_compiler:
cxx_compiler_version:
- '16'
libprotobuf:
- 4.25.2
- 4.25.3
macos_machine:
- arm64-apple-darwin20.0.0
numpy:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cxx_compiler:
cxx_compiler_version:
- '16'
libprotobuf:
- 4.25.2
- 4.25.3
macos_machine:
- arm64-apple-darwin20.0.0
numpy:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cxx_compiler:
cxx_compiler_version:
- '16'
libprotobuf:
- 4.25.2
- 4.25.3
macos_machine:
- arm64-apple-darwin20.0.0
numpy:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_numpy1.22python3.10.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ channel_targets:
cxx_compiler:
- vs2019
libprotobuf:
- 4.25.2
- 4.25.3
numpy:
- '1.22'
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_numpy1.22python3.8.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ channel_targets:
cxx_compiler:
- vs2019
libprotobuf:
- 4.25.2
- 4.25.3
numpy:
- '1.22'
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_numpy1.22python3.9.____73_pypy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ channel_targets:
cxx_compiler:
- vs2019
libprotobuf:
- 4.25.2
- 4.25.3
numpy:
- '1.22'
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_numpy1.22python3.9.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ channel_targets:
cxx_compiler:
- vs2019
libprotobuf:
- 4.25.2
- 4.25.3
numpy:
- '1.22'
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_numpy1.23python3.11.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ channel_targets:
cxx_compiler:
- vs2019
libprotobuf:
- 4.25.2
- 4.25.3
numpy:
- '1.23'
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_numpy1.26python3.12.____cpython.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ channel_targets:
cxx_compiler:
- vs2019
libprotobuf:
- 4.25.2
- 4.25.3
numpy:
- '1.26'
pin_run_as_build:
Expand Down
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:
- 0001-Link-to-abseil_dll.patch # [win and (libprotobuf != "3.21")]

build:
number: 2
number: 3
entry_points:
- check-model = onnx.bin.checker:check_model
- check-node = onnx.bin.checker:check_node
Expand Down

0 comments on commit 5355c54

Please sign in to comment.