Merge pull request #72 from regro-cf-autotick-bot/rebuild-libgrpc162_…

…libprotobuf4253-0-1_h94d986 Rebuild for libprotobuf 4.25.3
conda-forge · Mar 6, 2024 · 71adb1b · 71adb1b
2 parents 9e4e5e2 + 0adf82d
commit 71adb1b
Show file tree

Hide file tree

Showing 13 changed files with 41 additions and 27 deletions.
diff --git 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.25.2
+- 4.25.3
 lz4_c:
 - 1.9.3
 snappy:

diff --git 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.25.2
+- 4.25.3
 lz4_c:
 - 1.9.3
 snappy:

diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml
@@ -15,7 +15,7 @@ cxx_compiler_version:
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libprotobuf:
-- 4.25.2
+- 4.25.3
 lz4_c:
 - 1.9.3
 snappy:

diff --git a/.ci_support/migrations/libgrpc162_libprotobuf4253.yaml b/.ci_support/migrations/libgrpc162_libprotobuf4253.yaml
@@ -0,0 +1,23 @@
+__migrator:
+  build_number: 1
+  commit_message: Rebuild for libprotobuf 4.25.3
+  kind: version
+  migration_number: 1
+  exclude:
+    - abseil-cpp
+    - grpc-cpp
+    - libprotobuf
+    - protobuf
+libgrpc:
+- "1.62"
+libprotobuf:
+- 4.25.3
+# keep abseil bump from libabseil20240116_libgrpc161_libprotobuf4252;
+# this ensures that this migration applies also without the previous one
+libabseil:
+- "20240116"
+# 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: 1709522594.9193177
diff --git a/.ci_support/migrations/libprotobuf4251.yaml b/.ci_support/migrations/libprotobuf4251.yaml
diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
@@ -13,7 +13,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '16'
 libprotobuf:
-- 4.25.2
+- 4.25.3
 lz4_c:
 - 1.9.3
 macos_machine:

diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml
@@ -13,7 +13,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '16'
 libprotobuf:
-- 4.25.2
+- 4.25.3
 lz4_c:
 - 1.9.3
 macos_machine:

diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml
@@ -7,7 +7,7 @@ channel_targets:
 cxx_compiler:
 - vs2019
 libprotobuf:
-- 4.25.2
+- 4.25.3
 lz4_c:
 - 1.9.3
 snappy:

diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat
diff --git a/build-locally.py b/build-locally.py
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -17,7 +17,7 @@ source:
     - patches/0005-Check-for-protobuf-config-based-module.patch
 
 build:
-  number: 2
+  number: 3
   run_exports:
     - {{ pin_subpackage("orc", max_pin="x.x.x") }}
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,7 @@ cxx_compiler_version: @@
     docker_image:
     - quay.io/condaforge/linux-anvil-cos7-x86_64
     libprotobuf:
-    - 4.25.2
+    - 4.25.3
     lz4_c:
     - 1.9.3
     snappy:
@@ Expand Down @@