From b60aa6c8d44cafade4968668c23f26ef0871c532 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Olav=20L=C3=B8ite?= Date: Wed, 29 Oct 2025 16:18:57 +0100 Subject: [PATCH] fix: remove git submodule from project Remove the permanent git submodule from the project, and only add it on-demand when re-generating code from the proto definition for the gRPC API. --- .gitmodules | 3 --- spannerlib/grpc-server/build-protos.sh | 7 ++++++- spannerlib/grpc-server/googleapis | 1 - 3 files changed, 6 insertions(+), 5 deletions(-) delete mode 100644 .gitmodules delete mode 160000 spannerlib/grpc-server/googleapis diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 4b3a259c..00000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "spannerlib/grpc-server/googleapis"] - path = spannerlib/grpc-server/googleapis - url = git@github.com:googleapis/googleapis.git diff --git a/spannerlib/grpc-server/build-protos.sh b/spannerlib/grpc-server/build-protos.sh index d3721808..8148de7b 100755 --- a/spannerlib/grpc-server/build-protos.sh +++ b/spannerlib/grpc-server/build-protos.sh @@ -1,4 +1,5 @@ PATH="${PATH}:${HOME}/go/bin" +git submodule add git@github.com:googleapis/googleapis.git ln -sf "${PWD}"/google/spannerlib googleapis/google/spannerlib cd googleapis || exit 1 protoc \ @@ -13,9 +14,11 @@ protoc \ --java-grpc_out=../../wrappers/spannerlib-java/src/main/java/ \ --java-grpc_opt=paths=source_relative \ google/spannerlib/v1/spannerlib.proto + +# dotnet add package Grpc.Tools --version 2.76.0 protoc \ --csharp_out=../../wrappers/spannerlib-dotnet/spannerlib-dotnet-grpc-v1/ \ - --plugin=protoc-gen-csharp_grpc=/Users/loite/.nuget/packages/grpc.tools/2.72.0/tools/macosx_x64/grpc_csharp_plugin \ + --plugin=protoc-gen-csharp_grpc=/Users/loite/.nuget/packages/grpc.tools/2.76.0/tools/macosx_x64/grpc_csharp_plugin \ --csharp_grpc_out=../../wrappers/spannerlib-dotnet/spannerlib-dotnet-grpc-v1/ \ --csharp_opt=file_extension=.g.cs \ --csharp_grpc_opt=no_server \ @@ -23,3 +26,5 @@ protoc \ google/spannerlib/v1/spannerlib.proto cd .. || exit 1 rm googleapis/google/spannerlib +git rm googleapis +rm ../../.gitmodules diff --git a/spannerlib/grpc-server/googleapis b/spannerlib/grpc-server/googleapis deleted file mode 160000 index e9078581..00000000 --- a/spannerlib/grpc-server/googleapis +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e9078581209139d142aad60322b6e09f565eae41