Merge pull request #309 from h-vetinari/migrate

Prepare for joint migration with abseil & protobuf
conda-forge · Aug 11, 2023 · 6dbff2c · 6dbff2c
2 parents 2e04d51 + d20e3aa
commit 6dbff2c
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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:

diff --git 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
@@ -41,7 +41,7 @@ source:
     - patches/0013-don-t-use-find_dependency-for-protobuf.patch
 
 build:
-  number: 0
+  number: 1
 
 outputs:
   - name: libgrpc