diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index e6d8d63c..549bd521 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -21,9 +21,9 @@ docker_image: flatbuffers: - 24.3.25 libabseil: -- '20240116' +- '20240722' libprotobuf: -- 4.25.3 +- 5.27.5 megabuild: - 'true' pin_run_as_build: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 1ccfd963..4d6987af 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -25,9 +25,9 @@ docker_image: flatbuffers: - 24.3.25 libabseil: -- '20240116' +- '20240722' libprotobuf: -- 4.25.3 +- 5.27.5 megabuild: - 'true' pin_run_as_build: diff --git a/.ci_support/migrations/libabseil20240722_grpc165_libprotobuf5275.yaml b/.ci_support/migrations/libabseil20240722_grpc165_libprotobuf5275.yaml new file mode 100644 index 00000000..85540a1f --- /dev/null +++ b/.ci_support/migrations/libabseil20240722_grpc165_libprotobuf5275.yaml @@ -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 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 482ad883..27131e70 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -21,9 +21,9 @@ cxx_compiler_version: flatbuffers: - 24.3.25 libabseil: -- '20240116' +- '20240722' libprotobuf: -- 4.25.3 +- 5.27.5 macos_machine: - x86_64-apple-darwin13.4.0 megabuild: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 8616b2c5..aff37351 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -21,9 +21,9 @@ cxx_compiler_version: flatbuffers: - 24.3.25 libabseil: -- '20240116' +- '20240722' libprotobuf: -- 4.25.3 +- 5.27.5 macos_machine: - arm64-apple-darwin20.0.0 megabuild: diff --git a/.ci_support/win_64_python3.10.____cpython.yaml b/.ci_support/win_64_python3.10.____cpython.yaml index 059281b1..fbe7016b 100644 --- a/.ci_support/win_64_python3.10.____cpython.yaml +++ b/.ci_support/win_64_python3.10.____cpython.yaml @@ -11,9 +11,9 @@ cxx_compiler: flatbuffers: - 24.3.25 libabseil: -- '20240116' +- '20240722' libprotobuf: -- 4.25.3 +- 5.27.5 megabuild: - 'false' pin_run_as_build: diff --git a/.ci_support/win_64_python3.11.____cpython.yaml b/.ci_support/win_64_python3.11.____cpython.yaml index 6dc773ed..ec12d0a5 100644 --- a/.ci_support/win_64_python3.11.____cpython.yaml +++ b/.ci_support/win_64_python3.11.____cpython.yaml @@ -11,9 +11,9 @@ cxx_compiler: flatbuffers: - 24.3.25 libabseil: -- '20240116' +- '20240722' libprotobuf: -- 4.25.3 +- 5.27.5 megabuild: - 'false' pin_run_as_build: diff --git a/.ci_support/win_64_python3.12.____cpython.yaml b/.ci_support/win_64_python3.12.____cpython.yaml index 3a99641f..81d2506f 100644 --- a/.ci_support/win_64_python3.12.____cpython.yaml +++ b/.ci_support/win_64_python3.12.____cpython.yaml @@ -11,9 +11,9 @@ cxx_compiler: flatbuffers: - 24.3.25 libabseil: -- '20240116' +- '20240722' libprotobuf: -- 4.25.3 +- 5.27.5 megabuild: - 'false' pin_run_as_build: diff --git a/.ci_support/win_64_python3.9.____cpython.yaml b/.ci_support/win_64_python3.9.____cpython.yaml index 8edc3488..5847db8d 100644 --- a/.ci_support/win_64_python3.9.____cpython.yaml +++ b/.ci_support/win_64_python3.9.____cpython.yaml @@ -11,9 +11,9 @@ cxx_compiler: flatbuffers: - 24.3.25 libabseil: -- '20240116' +- '20240722' libprotobuf: -- 4.25.3 +- 5.27.5 megabuild: - 'false' pin_run_as_build: diff --git a/recipe/build.sh b/recipe/build.sh index 188affae..46e8aeae 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -1,8 +1,8 @@ # !/usr/bin/env bash -set +ex +set -exuo pipefail -if [[ "$CONDA_BUILD_CROSS_COMPILATION" == 1 ]]; then +if [[ "${CONDA_BUILD_CROSS_COMPILATION:-0}" == 1 ]]; then CMAKE_ARGS="${CMAKE_ARGS} -DProtobuf_PROTOC_EXECUTABLE=$BUILD_PREFIX/bin/protoc" fi diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f0848f04..66fe2fb0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -34,7 +34,7 @@ source: folder: thirdparty/onnx/onnx build: - number: 0 + number: 1 requirements: build: