admin/grpc
1
0
Fork 0
mirror of https://github.com/grpc/grpc.git synced 2026-01-24 10:53:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Fix] remove GRPCAPI annotation from cpp-only API to fix ruby tests. (#41407)

Browse Source 
`tools/artifact_gen/metadata_for_wrapped_languages.cc` determines whether a header exports C API by matching file contents against regex `?:GPRAPI|GRPCAPI|CENSUSAPI)([^#;]*)`, and the headers later get included by `rb_grpc_imports.generated.h`. The C++ std utility `std::optional<>` end up breaking ruby distrib tests.

It seems like all pending PRs are affected. An example: https://btx.cloud.google.com/invocations/4caed1d7-19e0-4a59-9786-28a7ddb03051/targets

<!--

If you know who should review your pull request, please assign it to that
person, otherwise the pull request would get assigned randomly.

If your pull request is for a specific language, please add the appropriate
lang label.

-->

Closes #41407

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/41407 from yuanweiz:fix_ruby 97f5c958e4
PiperOrigin-RevId: 856229588
This commit is contained in:
yuanweiz
2026-01-14 08:40:44 -08:00
committed by Copybara-Service
parent 01f57739a6
commit 62b4ac3649
4 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
grpc.def generated
View File

@@ -83,7 +83,6 @@ EXPORTS
grpc_local_server_credentials_create
grpc_tls_credentials_options_set_check_call_host
grpc_tls_credentials_options_set_tls_session_key_log_file_path
grpc_tls_credentials_options_set_sni_override
grpc_metadata_array_init
grpc_metadata_array_destroy
grpc_call_details_init

2
include/grpc/credentials_cpp.h
View File

@@ -32,7 +32,7 @@
* indicates that SNI should not be overridden. An empty string value indicates
* that SNI should not be sent at all.
*/
GRPCAPI void grpc_tls_credentials_options_set_sni_override(
void grpc_tls_credentials_options_set_sni_override(
grpc_tls_credentials_options* options,
std::optional<std::string> sni_override);

2
src/ruby/ext/grpc/rb_grpc_imports.generated.c generated
View File

@@ -106,7 +106,6 @@ grpc_local_credentials_create_type grpc_local_credentials_create_import;
grpc_local_server_credentials_create_type grpc_local_server_credentials_create_import;
grpc_tls_credentials_options_set_check_call_host_type grpc_tls_credentials_options_set_check_call_host_import;
grpc_tls_credentials_options_set_tls_session_key_log_file_path_type grpc_tls_credentials_options_set_tls_session_key_log_file_path_import;
grpc_tls_credentials_options_set_sni_override_type grpc_tls_credentials_options_set_sni_override_import;
grpc_metadata_array_init_type grpc_metadata_array_init_import;
grpc_metadata_array_destroy_type grpc_metadata_array_destroy_import;
grpc_call_details_init_type grpc_call_details_init_import;
@@ -394,7 +393,6 @@ void grpc_rb_load_imports(HMODULE library) {
grpc_local_server_credentials_create_import = (grpc_local_server_credentials_create_type) GetProcAddress(library, "grpc_local_server_credentials_create");
grpc_tls_credentials_options_set_check_call_host_import = (grpc_tls_credentials_options_set_check_call_host_type) GetProcAddress(library, "grpc_tls_credentials_options_set_check_call_host");
grpc_tls_credentials_options_set_tls_session_key_log_file_path_import = (grpc_tls_credentials_options_set_tls_session_key_log_file_path_type) GetProcAddress(library, "grpc_tls_credentials_options_set_tls_session_key_log_file_path");
grpc_tls_credentials_options_set_sni_override_import = (grpc_tls_credentials_options_set_sni_override_type) GetProcAddress(library, "grpc_tls_credentials_options_set_sni_override");
grpc_metadata_array_init_import = (grpc_metadata_array_init_type) GetProcAddress(library, "grpc_metadata_array_init");
grpc_metadata_array_destroy_import = (grpc_metadata_array_destroy_type) GetProcAddress(library, "grpc_metadata_array_destroy");
grpc_call_details_init_import = (grpc_call_details_init_type) GetProcAddress(library, "grpc_call_details_init");

4
src/ruby/ext/grpc/rb_grpc_imports.generated.h generated
View File

@@ -28,7 +28,6 @@
#include <grpc/byte_buffer.h>
#include <grpc/compression.h>
#include <grpc/credentials.h>
#include <grpc/credentials_cpp.h>
#include <grpc/grpc.h>
#include <grpc/grpc_posix.h>
#include <grpc/grpc_security.h>
@@ -295,9 +294,6 @@ extern grpc_tls_credentials_options_set_check_call_host_type grpc_tls_credential
typedef void(*grpc_tls_credentials_options_set_tls_session_key_log_file_path_type)(grpc_tls_credentials_options* options, const char* path);
extern grpc_tls_credentials_options_set_tls_session_key_log_file_path_type grpc_tls_credentials_options_set_tls_session_key_log_file_path_import;
#define grpc_tls_credentials_options_set_tls_session_key_log_file_path grpc_tls_credentials_options_set_tls_session_key_log_file_path_import
typedef void(*grpc_tls_credentials_options_set_sni_override_type)(grpc_tls_credentials_options* options, std::optional<std::string> sni_override);
extern grpc_tls_credentials_options_set_sni_override_type grpc_tls_credentials_options_set_sni_override_import;
#define grpc_tls_credentials_options_set_sni_override grpc_tls_credentials_options_set_sni_override_import
typedef void(*grpc_metadata_array_init_type)(grpc_metadata_array* array);
extern grpc_metadata_array_init_type grpc_metadata_array_init_import;
#define grpc_metadata_array_init grpc_metadata_array_init_import