From 51d096401416f9ea7c6d32c2791b9615e5703fce Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 3 Nov 2023 07:36:45 +0000 Subject: [PATCH 1/2] Rebuild for libgrpc159_libprotobuf4244 --- .../migrations/libgrpc159_libprotobuf4244.yaml | 16 ++++++++++++++++ recipe/meta.yaml | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/libgrpc159_libprotobuf4244.yaml diff --git a/.ci_support/migrations/libgrpc159_libprotobuf4244.yaml b/.ci_support/migrations/libgrpc159_libprotobuf4244.yaml new file mode 100644 index 0000000..8a51b6e --- /dev/null +++ b/.ci_support/migrations/libgrpc159_libprotobuf4244.yaml @@ -0,0 +1,16 @@ +__migrator: + build_number: 1 + kind: version + migration_number: 1 + exclude: + # this shouldn't attempt to modify the python feedstocks + - protobuf +libgrpc: +- "1.59" +libprotobuf: +- 4.24.4 +# 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 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 773989f..cf16354 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -18,7 +18,7 @@ source: - support_protobuf_crosscompilation.patch build: - number: 5 + number: 6 run_exports: - {{ pin_subpackage(name, max_pin='x') }} From a90d3f736875da5ef155f2fc456d07aff29ddc4f Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 3 Nov 2023 07:36:54 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.27.1, and conda-forge-pinning 2023.11.02.10.11.59 --- .ci_support/linux_64_.yaml | 2 +- .ci_support/linux_aarch64_.yaml | 2 +- .../migrations/libgrpc158_libprotobuf4243.yaml | 16 ---------------- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- .ci_support/win_64_.yaml | 2 +- 6 files changed, 5 insertions(+), 21 deletions(-) delete mode 100644 .ci_support/migrations/libgrpc158_libprotobuf4243.yaml diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index e9f6679..d8938a2 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: -- 4.24.3 +- 4.24.4 qt_main: - '5.15' target_platform: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index acbff77..8c0fb39 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -19,7 +19,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libprotobuf: -- 4.24.3 +- 4.24.4 qt_main: - '5.15' target_platform: diff --git a/.ci_support/migrations/libgrpc158_libprotobuf4243.yaml b/.ci_support/migrations/libgrpc158_libprotobuf4243.yaml deleted file mode 100644 index 2e4dc06..0000000 --- a/.ci_support/migrations/libgrpc158_libprotobuf4243.yaml +++ /dev/null @@ -1,16 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 - exclude: - # this shouldn't attempt to modify the python feedstocks - - protobuf -libgrpc: -- "1.58" -libprotobuf: -- 4.24.3 -# 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: 1695803907.2958245 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 2e0ebba..68ec761 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -15,7 +15,7 @@ cxx_compiler: cxx_compiler_version: - '16' libprotobuf: -- 4.24.3 +- 4.24.4 macos_machine: - x86_64-apple-darwin13.4.0 qt_main: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 25cd573..feaed01 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '16' libprotobuf: -- 4.24.3 +- 4.24.4 macos_machine: - arm64-apple-darwin20.0.0 qt_main: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index dbaf53d..3e4be77 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - vs2019 libprotobuf: -- 4.24.3 +- 4.24.4 qt_main: - '5.15' target_platform: