Merge branch 'master' of github.com:rules-proto-grpc/rules_proto_grpc
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml index 92bf9cf..a321dc8 100644 --- a/.bazelci/presubmit.yml +++ b/.bazelci/presubmit.yml
@@ -58,7 +58,6 @@ - "--test_output=errors" - "--cxxopt=-std=c++17" - "--host_cxxopt=-std=c++17" - - "--copt=-isystem/usr/local/include" test_targets: - "//examples/routeguide:cpp_cpp" - "//examples/routeguide:cpp_go" @@ -109,7 +108,6 @@ BAZEL_EXTRA_FLAGS: "--cxxopt=-std=c++17 --host_cxxopt=-std=c++17" shell_commands: - set -x - - export BAZEL_EXTRA_FLAGS="--copt=-isystem/usr/local/include $BAZEL_EXTRA_FLAGS" - make buf_buf_proto_breaking_test_example - make buf_buf_proto_lint_test_example @@ -145,7 +143,6 @@ BAZEL_EXTRA_FLAGS: "--cxxopt=-std=c++17 --host_cxxopt=-std=c++17" shell_commands: - set -x - - export BAZEL_EXTRA_FLAGS="--copt=-isystem/usr/local/include $BAZEL_EXTRA_FLAGS" - make c_c_proto_compile_example - make c_c_proto_library_example @@ -191,7 +188,6 @@ BAZEL_EXTRA_FLAGS: "--cxxopt=-std=c++17 --host_cxxopt=-std=c++17" shell_commands: - set -x - - export BAZEL_EXTRA_FLAGS="--copt=-isystem/usr/local/include $BAZEL_EXTRA_FLAGS" - make cpp_cpp_proto_compile_example - make cpp_cpp_grpc_compile_example - make cpp_cpp_proto_library_example @@ -244,7 +240,6 @@ BAZEL_EXTRA_FLAGS: "--cxxopt=-std=c++17 --host_cxxopt=-std=c++17" shell_commands: - set -x - - export BAZEL_EXTRA_FLAGS="--copt=-isystem/usr/local/include $BAZEL_EXTRA_FLAGS" - make doc_doc_docbook_compile_example - make doc_doc_html_compile_example - make doc_doc_json_compile_example @@ -293,7 +288,6 @@ BAZEL_EXTRA_FLAGS: "--cxxopt=-std=c++17 --host_cxxopt=-std=c++17" shell_commands: - set -x - - export BAZEL_EXTRA_FLAGS="--copt=-isystem/usr/local/include $BAZEL_EXTRA_FLAGS" - make go_go_proto_compile_example - make go_go_grpc_compile_example - make go_go_proto_library_example @@ -328,7 +322,6 @@ BAZEL_EXTRA_FLAGS: "--cxxopt=-std=c++17 --host_cxxopt=-std=c++17" shell_commands: - set -x - - export BAZEL_EXTRA_FLAGS="--copt=-isystem/usr/local/include $BAZEL_EXTRA_FLAGS" - make grpc_gateway_gateway_grpc_compile_example - make grpc_gateway_gateway_openapiv2_compile_example - make grpc_gateway_gateway_grpc_library_example @@ -375,7 +368,6 @@ BAZEL_EXTRA_FLAGS: "--cxxopt=-std=c++17 --host_cxxopt=-std=c++17" shell_commands: - set -x - - export BAZEL_EXTRA_FLAGS="--copt=-isystem/usr/local/include $BAZEL_EXTRA_FLAGS" - make java_java_proto_compile_example - make java_java_grpc_compile_example - make java_java_proto_library_example @@ -388,7 +380,6 @@ BAZEL_EXTRA_FLAGS: "--cxxopt=-std=c++17 --host_cxxopt=-std=c++17" shell_commands: - set -x - - export BAZEL_EXTRA_FLAGS="--copt=-isystem/usr/local/include $BAZEL_EXTRA_FLAGS" - make objc_objc_proto_compile_example - make objc_objc_grpc_compile_example - make objc_objc_proto_library_example @@ -433,7 +424,6 @@ BAZEL_EXTRA_FLAGS: "--cxxopt=-std=c++17 --host_cxxopt=-std=c++17" shell_commands: - set -x - - export BAZEL_EXTRA_FLAGS="--copt=-isystem/usr/local/include $BAZEL_EXTRA_FLAGS" - make python_python_proto_compile_example - make python_python_grpc_compile_example - make python_python_proto_library_example
diff --git a/tools/rulegen/main.go b/tools/rulegen/main.go index ef832b8..931bb88 100644 --- a/tools/rulegen/main.go +++ b/tools/rulegen/main.go
@@ -31,7 +31,7 @@ // files coming from -iquote etc. This only appears to be a problem on the Bazel MacOS CI // machines on BuildKite, as a local MacOS build does not require this workaround. Perhaps // the CI machines have Homebrew installed etc. - "--copt=-isystem/usr/local/include", + //"--copt=-isystem/usr/local/include", }, }