Skip to content

Commit

Permalink
Merge pull request #122 from regro-cf-autotick-bot/rebuild-libabseil2…
Browse files Browse the repository at this point in the history 
…0240722_grpc165_libprotobuf5275-0-1_h9c9f06

Rebuild for libabseil 20240722, libgrp 1.65 & libprotobuf 5.27.5
  • Loading branch information
@xhochy
xhochy authored Sep 25, 2024
2 parents ddc59d9 + 2de2ca7 commit 323cd1b
Show file tree
Hide file tree
Showing 35 changed files with 54 additions and 34 deletions.
2 changes: 1 addition & 1 deletion .ci_support/linux_64_numpy2.0python3.10.____cpython.yaml
View file
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-cos7-x86_64
libprotobuf:
- 4.25.3
- 5.27.5
numpy:
- '2.0'
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_numpy2.0python3.11.____cpython.yaml
View file
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-cos7-x86_64
libprotobuf:
- 4.25.3
- 5.27.5
numpy:
- '2.0'
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_numpy2.0python3.12.____cpython.yaml
View file
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-cos7-x86_64
libprotobuf:
- 4.25.3
- 5.27.5
numpy:
- '2.0'
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_numpy2.0python3.9.____cpython.yaml
View file
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-cos7-x86_64
libprotobuf:
- 4.25.3
- 5.27.5
numpy:
- '2.0'
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_64_numpy2python3.13.____cp313.yaml
View file
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-cos7-x86_64
libprotobuf:
- 4.25.3
- 5.27.5
numpy:
- '2'
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_numpy2.0python3.10.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-aarch64
libprotobuf:
- 4.25.3
- 5.27.5
numpy:
- '2.0'
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_numpy2.0python3.11.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-aarch64
libprotobuf:
- 4.25.3
- 5.27.5
numpy:
- '2.0'
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_numpy2.0python3.12.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-aarch64
libprotobuf:
- 4.25.3
- 5.27.5
numpy:
- '2.0'
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_numpy2.0python3.9.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-aarch64
libprotobuf:
- 4.25.3
- 5.27.5
numpy:
- '2.0'
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_aarch64_numpy2python3.13.____cp313.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ cxx_compiler_version:
docker_image:
- quay.io/condaforge/linux-anvil-aarch64
libprotobuf:
- 4.25.3
- 5.27.5
numpy:
- '2'
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_numpy2.0python3.10.____cpython.yaml
View file
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-ppc64le
libprotobuf:
- 4.25.3
- 5.27.5
numpy:
- '2.0'
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_numpy2.0python3.11.____cpython.yaml
View file
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-ppc64le
libprotobuf:
- 4.25.3
- 5.27.5
numpy:
- '2.0'
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_numpy2.0python3.12.____cpython.yaml
View file
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-ppc64le
libprotobuf:
- 4.25.3
- 5.27.5
numpy:
- '2.0'
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_numpy2.0python3.9.____cpython.yaml
View file
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-ppc64le
libprotobuf:
- 4.25.3
- 5.27.5
numpy:
- '2.0'
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_numpy2python3.13.____cp313.yaml
View file
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-ppc64le
libprotobuf:
- 4.25.3
- 5.27.5
numpy:
- '2'
pin_run_as_build:
Expand Down
18 changes: 18 additions & 0 deletions .ci_support/migrations/libabseil20240722_grpc165_libprotobuf5275.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
__migrator:
build_number: 1
commit_message: Rebuild for libabseil 20240722, libgrp 1.65 & libprotobuf 5.27.5
kind: version
migration_number: 1
exclude:
- abseil-cpp
- grpc-cpp
- libprotobuf
- protobuf
- re2
libabseil:
- 20240722
libgrpc:
- "1.65"
libprotobuf:
- 5.27.5
migrator_ts: 1727040240.8650293
2 changes: 1 addition & 1 deletion .ci_support/osx_64_numpy2.0python3.10.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ cxx_compiler:
cxx_compiler_version:
- '17'
libprotobuf:
- 4.25.3
- 5.27.5
macos_machine:
- x86_64-apple-darwin13.4.0
numpy:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_numpy2.0python3.11.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ cxx_compiler:
cxx_compiler_version:
- '17'
libprotobuf:
- 4.25.3
- 5.27.5
macos_machine:
- x86_64-apple-darwin13.4.0
numpy:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_numpy2.0python3.12.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ cxx_compiler:
cxx_compiler_version:
- '17'
libprotobuf:
- 4.25.3
- 5.27.5
macos_machine:
- x86_64-apple-darwin13.4.0
numpy:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_numpy2.0python3.9.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ cxx_compiler:
cxx_compiler_version:
- '17'
libprotobuf:
- 4.25.3
- 5.27.5
macos_machine:
- x86_64-apple-darwin13.4.0
numpy:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_numpy2python3.13.____cp313.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ cxx_compiler:
cxx_compiler_version:
- '17'
libprotobuf:
- 4.25.3
- 5.27.5
macos_machine:
- x86_64-apple-darwin13.4.0
numpy:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ cxx_compiler:
cxx_compiler_version:
- '17'
libprotobuf:
- 4.25.3
- 5.27.5
macos_machine:
- arm64-apple-darwin20.0.0
numpy:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ cxx_compiler:
cxx_compiler_version:
- '17'
libprotobuf:
- 4.25.3
- 5.27.5
macos_machine:
- arm64-apple-darwin20.0.0
numpy:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ cxx_compiler:
cxx_compiler_version:
- '17'
libprotobuf:
- 4.25.3
- 5.27.5
macos_machine:
- arm64-apple-darwin20.0.0
numpy:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ cxx_compiler:
cxx_compiler_version:
- '17'
libprotobuf:
- 4.25.3
- 5.27.5
macos_machine:
- arm64-apple-darwin20.0.0
numpy:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_numpy2python3.13.____cp313.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ cxx_compiler:
cxx_compiler_version:
- '17'
libprotobuf:
- 4.25.3
- 5.27.5
macos_machine:
- arm64-apple-darwin20.0.0
numpy:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_numpy2.0python3.10.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ channel_targets:
cxx_compiler:
- vs2019
libprotobuf:
- 4.25.3
- 5.27.5
numpy:
- '2.0'
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_numpy2.0python3.11.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ channel_targets:
cxx_compiler:
- vs2019
libprotobuf:
- 4.25.3
- 5.27.5
numpy:
- '2.0'
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_numpy2.0python3.12.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ channel_targets:
cxx_compiler:
- vs2019
libprotobuf:
- 4.25.3
- 5.27.5
numpy:
- '2.0'
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_numpy2.0python3.9.____cpython.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ channel_targets:
cxx_compiler:
- vs2019
libprotobuf:
- 4.25.3
- 5.27.5
numpy:
- '2.0'
pin_run_as_build:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_numpy2python3.13.____cp313.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ channel_targets:
cxx_compiler:
- vs2019
libprotobuf:
- 4.25.3
- 5.27.5
numpy:
- '2'
pin_run_as_build:
Expand Down
2 changes: 2 additions & 0 deletions .scripts/build_steps.sh
View file

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
View file

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

2 changes: 1 addition & 1 deletion build-locally.py
View file

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
View file
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: 1
number: 2
entry_points:
- check-model = onnx.bin.checker:check_model
- check-node = onnx.bin.checker:check_node
Expand Down

0 comments on commit 323cd1b

Please sign in to comment.