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

…libprotobuf4253-0-1_h76d7e5 Rebuild for libprotobuf 4.25.3
conda-forge · Mar 16, 2024 · 6de0925 · 6de0925
2 parents f443257 + a30326d
commit 6de0925
Show file tree

Hide file tree

Showing 14 changed files with 41 additions and 150 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
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
 qt_main:
 - '5.15'
 target_platform:

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
 qt_main:
 - '5.15'
 target_platform:

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
@@ -15,7 +15,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '16'
 libprotobuf:
-- 4.25.2
+- 4.25.3
 macos_machine:
 - x86_64-apple-darwin13.4.0
 qt_main:

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
 macos_machine:
 - arm64-apple-darwin20.0.0
 qt_main:

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/conda-forge.yml b/conda-forge.yml
@@ -1,5 +1,7 @@
 azure:
   store_build_artifacts: true
+bot:
+  automerge: true
 build_platform:
   linux_aarch64: linux_64
   osx_arm64: osx_64
@@ -8,5 +10,3 @@ github:
   branch_name: main
   tooling_branch_name: main
 test: native_and_emulated
-bot:
-  automerge: true
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -19,7 +19,7 @@ source:
 
 build:
   skip: true  # [win]
-  number: 9
+  number: 10
   run_exports:
     - {{ pin_subpackage(name, max_pin='x') }}