grpc-cpp v1.81.0

.github/workflows/conda-build.yml

@@ -23,20 +23,32 @@ jobs:
       matrix:
         include:
           - CONFIG: linux_64_
+            STORE_BUILD_ARTIFACTS: False
             UPLOAD_PACKAGES: True
             os: ubuntu
             runs_on: ['ubuntu-latest']
             DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
+            tools_install_dir: ~/miniforge3
+            build_workspace_dir: build_artifacts
+            docker_run_args: 
           - CONFIG: linux_aarch64_
+            STORE_BUILD_ARTIFACTS: False
             UPLOAD_PACKAGES: True
             os: ubuntu
             runs_on: ['ubuntu-latest']
             DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
+            tools_install_dir: ~/miniforge3
+            build_workspace_dir: build_artifacts
+            docker_run_args: 
           - CONFIG: linux_ppc64le_
+            STORE_BUILD_ARTIFACTS: False
             UPLOAD_PACKAGES: True
             os: ubuntu
             runs_on: ['ubuntu-latest']
             DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
+            tools_install_dir: ~/miniforge3
+            build_workspace_dir: build_artifacts
+            docker_run_args: 
     steps:
 
     - name: Checkout code
@@ -46,11 +58,13 @@ jobs:
       id: build-linux
       if: matrix.os == 'ubuntu'
       env:
+        MINIFORGE_HOME: ${{ matrix.tools_install_dir }}
+        CONDA_BLD_PATH: ${{ matrix.build_workspace_dir }}
         CONFIG: ${{ matrix.CONFIG }}
         UPLOAD_PACKAGES: ${{ matrix.UPLOAD_PACKAGES }}
         DOCKER_IMAGE: ${{ matrix.DOCKER_IMAGE }}
         CI: github_actions
-        CONDA_FORGE_DOCKER_RUN_ARGS: "${{ matrix.CONDA_FORGE_DOCKER_RUN_ARGS }}"
+        CONDA_FORGE_DOCKER_RUN_ARGS: "${{ matrix.docker_run_args }}"
         BINSTAR_TOKEN: ${{ secrets.BINSTAR_TOKEN }}
         FEEDSTOCK_TOKEN: ${{ secrets.FEEDSTOCK_TOKEN }}
         STAGING_BINSTAR_TOKEN: ${{ secrets.STAGING_BINSTAR_TOKEN }}
@@ -70,13 +84,17 @@ jobs:
         else
           export IS_PR_BUILD="False"
         fi
+        export MINIFORGE_HOME="${MINIFORGE_HOME/#~/${HOME}}"
+        export CONDA_BLD_PATH="${CONDA_BLD_PATH/#~/${HOME}}"
         echo "::endgroup::"
         ./.scripts/run_docker_build.sh
 
     - name: Build on macOS
       id: build-macos
       if: matrix.os == 'macos'
       env:
+        MINIFORGE_HOME: ${{ matrix.tools_install_dir }}
+        CONDA_BLD_PATH: ${{ matrix.build_workspace_dir }}
         CONFIG: ${{ matrix.CONFIG }}
         UPLOAD_PACKAGES: ${{ matrix.UPLOAD_PACKAGES }}
         CI: github_actions
@@ -95,6 +113,8 @@ jobs:
         else
           export IS_PR_BUILD="False"
         fi
+        export MINIFORGE_HOME="${MINIFORGE_HOME/#~/${HOME}}"
+        export CONDA_BLD_PATH="${CONDA_BLD_PATH/#~/${HOME}}"
         ./.scripts/run_osx_build.sh
 
     - name: Build on windows
@@ -107,10 +127,8 @@ jobs:
         set "sha=%GITHUB_SHA%"
         call ".scripts\run_win_build.bat"
       env:
-        # default value; make it explicit, as it needs to match with artefact
-        # generation below. Not configurable for now, can be revisited later
-        CONDA_BLD_DIR: C:\bld
-        MINIFORGE_HOME: ${{ contains(runner.arch, 'ARM') && 'C' || 'D' }}:\Miniforge
+        MINIFORGE_HOME: ${{ matrix.tools_install_dir }}
+        CONDA_BLD_PATH: ${{ matrix.build_workspace_dir }}
         PYTHONUNBUFFERED: 1
         CONFIG: ${{ matrix.CONFIG }}
         CI: github_actions

recipe/meta.yaml

@@ -1,4 +1,4 @@
-{% set version = "1.80.0" %}
+{% set version = "1.81.0" %}
 
 # core package & vendored libs use different version scheme than CPP libs, see
 # top of https://github.com/grpc/grpc/blob/v{{ version }}/CMakeLists.txt
@@ -19,7 +19,7 @@ package:
 
 source:
   - url: https://github.com/grpc/grpc/archive/v{{ version.replace(".pre", "-pre") }}.tar.gz
-    sha256: 38f58596277fa632064cc0719b9ece4381c8c77461cb51e9b66ca149574b7865
+    sha256: 41b695614b26652ff9e97ce50cfd4a6c7a3d45a9fe598d1454407746499bbf2c
     patches:
       - patches/0001-windows-ssl-lib-names.patch
       - patches/0002-fix-win-setup-cmds.patch

recipe/patches/0001-windows-ssl-lib-names.patch

@@ -11,10 +11,10 @@ Co-Authored-By: Marius van Niekerk <marius.v.niekerk@gmail.com>
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index f02499a2a3..44b54a1472 100644
+index 28860ec..7f46c44 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -380,10 +380,10 @@ if "win32" in sys.platform:
+@@ -381,10 +381,10 @@ if "win32" in sys.platform:
          "ws2_32",
      )
  if BUILD_WITH_SYSTEM_OPENSSL:

recipe/patches/0002-fix-win-setup-cmds.patch

@@ -12,10 +12,10 @@ Co-Authored-By: H. Vetinari <h.vetinari@gmx.com>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index 44b54a1472..1a3f29bc26 100644
+index 7f46c44..d8e9bc2 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -203,6 +203,9 @@ ENABLE_DOCUMENTATION_BUILD = _env_bool_value(
+@@ -201,6 +201,9 @@ ENABLE_DOCUMENTATION_BUILD = _env_bool_value(
 
 
  def check_linker_need_libatomic():
@@ -25,13 +25,13 @@ index 44b54a1472..1a3f29bc26 100644
      """Test if linker on system needs libatomic."""
      code_test = (
          b"#include <atomic>\n"
-@@ -266,9 +269,6 @@ if EXTRA_ENV_COMPILE_ARGS is None:
+@@ -264,9 +267,6 @@ if EXTRA_ENV_COMPILE_ARGS is None:
          # MSVC by defaults uses C++14 and C89 so both needs to be configured.
          EXTRA_ENV_COMPILE_ARGS += " /std:c++17"
          EXTRA_ENV_COMPILE_ARGS += " /std:c11"
 -        # We need to statically link the C++ Runtime, only the C runtime is
 -        # available dynamically
 -        EXTRA_ENV_COMPILE_ARGS += " /MT"
-     elif "linux" in sys.platform:
-         # GCC by defaults uses C17 so only C++17 needs to be specified.
-         EXTRA_ENV_COMPILE_ARGS += " -std=c++17"
+         # Required to build upb from protobuf 33.x
+         # https://github.com/grpc/grpc/issues/41951
+         EXTRA_ENV_COMPILE_ARGS += " /Zc:preprocessor"

recipe/patches/0003-Link-against-grpc-and-abseil.patch

@@ -9,10 +9,10 @@ Co-Authored-By: H. Vetinari <h.vetinari@gmx.com>
  1 file changed, 19 insertions(+), 5 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index 1a3f29bc26..1ea1d60c71 100644
+index d8e9bc2..dbd69dc 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -174,6 +174,8 @@ BUILD_WITH_STATIC_LIBSTDCXX = _env_bool_value(
+@@ -172,6 +172,8 @@ BUILD_WITH_STATIC_LIBSTDCXX = _env_bool_value(
      "GRPC_PYTHON_BUILD_WITH_STATIC_LIBSTDCXX", "False"
  )
 
@@ -21,7 +21,7 @@ index 1a3f29bc26..1ea1d60c71 100644
  # For local development use only: This skips building gRPC Core and its
  # dependencies, including protobuf and boringssl. This allows "incremental"
  # compilation by first building gRPC Core using make, then building only the
-@@ -391,10 +393,20 @@ if BUILD_WITH_SYSTEM_CARES:
+@@ -392,10 +394,20 @@ if BUILD_WITH_SYSTEM_CARES:
  if BUILD_WITH_SYSTEM_RE2:
      EXTENSION_LIBRARIES += ("re2",)
  if BUILD_WITH_SYSTEM_ABSL:
@@ -46,7 +46,7 @@ index 1a3f29bc26..1ea1d60c71 100644
 
  DEFINE_MACROS = (("_WIN32_WINNT", 0x600),)
  asm_files = []
-@@ -506,6 +518,9 @@ def cython_extensions_and_necessity():
+@@ -507,6 +519,9 @@ def cython_extensions_and_necessity():
              prefix + "libgrpc.a",
          ]
          core_c_files = []
@@ -56,7 +56,7 @@ index 1a3f29bc26..1ea1d60c71 100644
      else:
          core_c_files = list(CORE_C_FILES)
          extra_objects = []
-@@ -517,7 +532,6 @@ def cython_extensions_and_necessity():
+@@ -518,7 +533,6 @@ def cython_extensions_and_necessity():
                  + list(GRPCIO_CC_SRCS)
                  + core_c_files
                  + asm_files

recipe/patches/0004-force-protoc-executable.patch

@@ -8,7 +8,7 @@ Subject: [PATCH 04/17] force protoc executable
  1 file changed, 2 insertions(+), 15 deletions(-)
 
 diff --git a/cmake/protobuf.cmake b/cmake/protobuf.cmake
-index ad80ca6e46..7bae8d95bd 100644
+index ad80ca6..7bae8d9 100644
 --- a/cmake/protobuf.cmake
 +++ b/cmake/protobuf.cmake
 @@ -70,21 +70,8 @@ elseif(gRPC_PROTOBUF_PROVIDER STREQUAL "package")

recipe/patches/0005-mark-linkages-of-grpc-_unsecure-as-private.patch

@@ -13,10 +13,10 @@ Co-Authored-By: Mark Harfouche <mark.harfouche@gmail.com>
  1 file changed, 58 insertions(+), 48 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e36e2fe59c..8980faabe5 100644
+index c72bd40..cd53f12 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -3143,34 +3143,39 @@ target_include_directories(grpc
+@@ -3173,34 +3173,39 @@ target_include_directories(grpc
      ${_gRPC_ZLIB_INCLUDE_DIR}
  )
  target_link_libraries(grpc
@@ -82,7 +82,7 @@ index e36e2fe59c..8980faabe5 100644
  endif()
 
  foreach(_hdr
-@@ -3882,31 +3887,36 @@ target_include_directories(grpc_unsecure
+@@ -3914,31 +3919,36 @@ target_include_directories(grpc_unsecure
      ${_gRPC_ZLIB_INCLUDE_DIR}
  )
  target_link_libraries(grpc_unsecure