Merge pull request #4955 from h-vetinari/proto

finish combined abseil/grpc/protobuf migration
conda-forge · Oct 8, 2023 · db1000d · db1000d
2 parents 086a2d5 + 621d4a7
commit db1000d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
@@ -420,7 +420,7 @@ kealib:
 krb5:
   - '1.20'
 libabseil:
-  - '20230125'
+  - '20230802'
 libabseil_static:
   - '20220623.0'
 libaec:
@@ -468,7 +468,7 @@ libgit2:
 libgoogle_cloud:
   - '2.12'
 libgrpc:
-  - '1.56'
+  - '1.57'
 libhugetlbfs:
   - 2
 libhwy:
@@ -498,7 +498,7 @@ libpcap:
 libpng:
   - 1.6
 libprotobuf:
-  - 4.23.3
+  - 4.23.4
 libpq:
   - 15
 libraw:

diff --git a/recipe/migrations/libabseil20230802_libgrpc157_libprotobuf4234.yaml b/recipe/migrations/libabseil20230802_libgrpc157_libprotobuf4234.yaml
@@ -2,12 +2,9 @@ __migrator:
   build_number: 1
   kind: version
   migration_number: 1
-libabseil:
-- 20230802
-libgrpc:
-- "1.57"
-libprotobuf:
-- 4.23.4
+# need to keep this in the migrator until we're ready
+# to bump the deployment target conda-forge-wide, see
+# https://github.com/conda-forge/conda-forge.github.io/issues/1844#issuecomment-1734933359
 MACOSX_DEPLOYMENT_TARGET:  # [osx and x86_64]
 - "10.13"                  # [osx and x86_64]
 migrator_ts: 1692632590.658328