From f5a6ada9b88318f8ba532a427d4979c60fda78f3 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 11 Aug 2023 14:47:25 +1100 Subject: [PATCH 1/2] use libabseil & libprotobuf that are linked in migrator --- recipe/conda_build_config.yaml | 5 ++++- recipe/meta.yaml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 85d52b41..0e295b0c 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -5,5 +5,8 @@ MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] MACOSX_SDK_VERSION: # [osx and x86_64] - "10.13" # [osx and x86_64] +# manual pins because we're linking migrations +libabseil: + - 20230802 libprotobuf: - - 4.23.3 + - 4.23.4 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b5425d50..df9d2438 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -41,7 +41,7 @@ source: - patches/0013-don-t-use-find_dependency-for-protobuf.patch build: - number: 0 + number: 1 outputs: - name: libgrpc From d20e3aa5b272f45a1296b8020a57fe796089cd07 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 11 Aug 2023 14:49:14 +1100 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 3.26.0, conda-smithy 3.24.1, and conda-forge-pinning 2023.08.10.19.07.29 --- .ci_support/linux_64_.yaml | 4 ++-- .ci_support/linux_aarch64_.yaml | 4 ++-- .ci_support/linux_ppc64le_.yaml | 4 ++-- .ci_support/osx_64_.yaml | 4 ++-- .ci_support/osx_arm64_.yaml | 4 ++-- .ci_support/win_64_.yaml | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 4423c16f..3b463ae6 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -17,9 +17,9 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libabseil: -- '20230125' +- '20230802' libprotobuf: -- 4.23.3 +- 4.23.4 openssl: - '3' pin_run_as_build: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index ba701d13..d251c563 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -21,9 +21,9 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libabseil: -- '20230125' +- '20230802' libprotobuf: -- 4.23.3 +- 4.23.4 openssl: - '3' pin_run_as_build: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 7fa82e2d..fc2108a1 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -17,9 +17,9 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libabseil: -- '20230125' +- '20230802' libprotobuf: -- 4.23.3 +- 4.23.4 openssl: - '3' pin_run_as_build: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 41f82532..10ebb625 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -17,9 +17,9 @@ cxx_compiler: cxx_compiler_version: - '15' libabseil: -- '20230125' +- '20230802' libprotobuf: -- 4.23.3 +- 4.23.4 macos_machine: - x86_64-apple-darwin13.4.0 openssl: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 2528e7e0..845ec45e 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -15,9 +15,9 @@ cxx_compiler: cxx_compiler_version: - '15' libabseil: -- '20230125' +- '20230802' libprotobuf: -- 4.23.3 +- 4.23.4 macos_machine: - arm64-apple-darwin20.0.0 openssl: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 66d127cf..36191037 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -9,9 +9,9 @@ channel_targets: cxx_compiler: - vs2019 libabseil: -- '20230125' +- '20230802' libprotobuf: -- 4.23.3 +- 4.23.4 openssl: - '3' pin_run_as_build: