Merge pull request #344 from h-vetinari/proto

Rebuild for protobuf 4.25.1
conda-forge · Jan 23, 2024 · 16654eb · 16654eb
2 parents 32fdbec + d3fcdb0
commit 16654eb
Show file tree

Hide file tree

Showing 12 changed files with 49 additions and 16 deletions.
diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml
@@ -19,7 +19,7 @@ docker_image:
 libabseil:
 - '20230802'
 libprotobuf:
-- 4.24.4
+- 4.25.1
 openssl:
 - '3'
 pin_run_as_build:

diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml
@@ -23,7 +23,7 @@ docker_image:
 libabseil:
 - '20230802'
 libprotobuf:
-- 4.24.4
+- 4.25.1
 openssl:
 - '3'
 pin_run_as_build:

diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml
@@ -19,7 +19,7 @@ docker_image:
 libabseil:
 - '20230802'
 libprotobuf:
-- 4.24.4
+- 4.25.1
 openssl:
 - '3'
 pin_run_as_build:

diff --git a/.ci_support/migrations/libprotobuf4251.yaml b/.ci_support/migrations/libprotobuf4251.yaml
@@ -0,0 +1,10 @@
+__migrator:
+  build_number: 1
+  commit_message: Rebuild for libprotobuf 4.25.1
+  kind: version
+  migration_number: 1
+libgrpc:
+- "1.60"
+libprotobuf:
+- 4.25.1
+migrator_ts: 1705841975.2201185
diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
@@ -17,7 +17,7 @@ cxx_compiler_version:
 libabseil:
 - '20230802'
 libprotobuf:
-- 4.24.4
+- 4.25.1
 macos_machine:
 - x86_64-apple-darwin13.4.0
 openssl:

diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml
@@ -17,7 +17,7 @@ cxx_compiler_version:
 libabseil:
 - '20230802'
 libprotobuf:
-- 4.24.4
+- 4.25.1
 macos_machine:
 - arm64-apple-darwin20.0.0
 openssl:

diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml
@@ -11,7 +11,7 @@ cxx_compiler:
 libabseil:
 - '20230802'
 libprotobuf:
-- 4.24.4
+- 4.25.1
 openssl:
 - '3'
 pin_run_as_build:

diff --git a/.gitignore b/.gitignore
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh
diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat
diff --git a/conda-forge.yml b/conda-forge.yml
@@ -11,4 +11,4 @@ conda_forge_output_validation: true
 github:
   branch_name: main
   tooling_branch_name: main
-test_on_native_only: true
+test: native_and_emulated