Protogolf (#83)

* btoken

* make it work

* rename golf proto

Author: aaylward

.bazelrc

@@ -2,6 +2,7 @@ startup --output_base=~/.bazelout
 
 build --cxxopt='-std=c++17'
 build --host_cxxopt='-std=c++17'
+build --disk_cache=~/bzlcache
 
 test --cxxopt='-std=c++17'
 test --host_cxxopt='-std=c++17'

.circleci/config.yml

@@ -35,9 +35,6 @@ jobs:
       - run:
           name: Run Go Tests
           command: bazel test //go/...
-      - run:
-          name: Run Rust Tests
-          command: bazel test //rust/...
       - run:
           name: Run Cpp Tests
           command: bazel test //cpp/...

.clwb/.bazelproject

@@ -1,5 +1,6 @@
 directories:
   cpp
+  protos
 
 # Automatically includes all relevant targets under the 'directories' above
 derive_targets_from_directories: true

WORKSPACE

@@ -1,9 +1,25 @@
 workspace(name = "moon_base")
 
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("//bazel:http_archives.bzl", "register_http_archive_dependencies")
 
 register_http_archive_dependencies()
 
+#######################################################################################
+##################################################
+##################
+#
+#                             load protos first to get pre-compiled version
+#
+#############################################################
+#######################################################################################
+
+load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
+
+rules_proto_dependencies()
+
+rules_proto_toolchains()
+
 ########################################################################################
 ##################################################
 ###################
@@ -23,47 +39,41 @@ go_register_toolchains(version = "1.20.4")
 ##################################################
 ###################
 #
-#                             cpp stuff
+#                             grpc proto stuff
 #
 ##############################################################
 ########################################################################################
 
-load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
-
-grpc_deps()
-
-load("@com_github_grpc_grpc//bazel:grpc_extra_deps.bzl", "grpc_extra_deps")
+load("@rules_proto_grpc//:repositories.bzl", "rules_proto_grpc_repos", "rules_proto_grpc_toolchains")
 
-grpc_extra_deps()
+rules_proto_grpc_toolchains()
 
-load("@hedron_compile_commands//:workspace_setup.bzl", "hedron_compile_commands_setup")
+rules_proto_grpc_repos()
 
-hedron_compile_commands_setup()
+#load("@rules_proto_grpc//cpp:repositories.bzl", "cpp_repos")
+#
+#cpp_repos()
 
 ########################################################################################
 ##################################################
 ###################
 #
-#                             proto stuff
+#                             cpp stuff
 #
 ##############################################################
 ########################################################################################
 
-load("@rules_proto_grpc//:repositories.bzl", "rules_proto_grpc_repos", "rules_proto_grpc_toolchains")
-
-rules_proto_grpc_toolchains()
-
-rules_proto_grpc_repos()
+load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
 
-load("@rules_proto_grpc//cpp:repositories.bzl", "cpp_repos")
+grpc_deps()
 
-cpp_repos()
+load("@com_github_grpc_grpc//bazel:grpc_extra_deps.bzl", "grpc_extra_deps")
 
-load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
+grpc_extra_deps()
 
-rules_proto_dependencies()
+load("@hedron_compile_commands//:workspace_setup.bzl", "hedron_compile_commands_setup")
 
-rules_proto_toolchains()
+hedron_compile_commands_setup()
 
 ########################################################################################
 ##################################################
@@ -173,21 +183,3 @@ load("@io_bazel_rules_scala//scala/scalafmt:scalafmt_repositories.bzl", "scalafm
 scalafmt_default_config()
 
 scalafmt_repositories()
-
-#############################################################
-#############
-##               Rust Stuff
-###
-##############
-#############################################################
-
-load("@rules_rust//rust:repositories.bzl", "rules_rust_dependencies", "rust_register_toolchains")
-
-rules_rust_dependencies()
-
-rust_register_toolchains(
-    edition = "2021",
-    versions = [
-        "1.71.0",
-    ],
-)

bazel/http_archives.bzl

@@ -1,14 +1,32 @@
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 def register_http_archive_dependencies():
+    http_archive(
+        name = "com_github_bazelbuild_buildtools",
+        sha256 = "977a0bd4593c8d4c8f45e056d181c35e48aa01ad4f8090bdb84f78dca42f47dc",
+        strip_prefix = "buildtools-6.1.2",
+        urls = [
+            "https://github.com/bazelbuild/buildtools/archive/refs/tags/v6.1.2.tar.gz",
+        ],
+    )
+
+    http_archive(
+        name = "rules_proto",
+        sha256 = "bc12122a5ae4b517fa423ea03a8d82ea6352d5127ea48cb54bc324e8ab78493c",
+        strip_prefix = "rules_proto-af6481970a34554c6942d993e194a9aed7987780",
+        urls = [
+            "https://github.com/bazelbuild/rules_proto/archive/af6481970a34554c6942d993e194a9aed7987780.tar.gz",
+        ],
+    )
+
     http_archive(
         name = "com_github_grpc_grpc",
         patch_args = ["-p1"],
         patches = ["//bazel/patches:grpc_extra_deps.patch"],
-        sha256 = "d8c3180df613759e705aabde77798a463b8d2dad08f182cf4cbdc6d8c9d0ebdd",
-        strip_prefix = "grpc-fd843629c89a22fc920fbbda8bcd79aa3b86add4",
+        sha256 = "64c3756f8f4ac3a876655f6a04f4d9f6858c77612d79200d0528ad923d5550c7",
+        strip_prefix = "grpc-8871dab19b4ab5389e28474d25cfeea61283265c",
         urls = [
-            "https://github.com/grpc/grpc/archive/fd843629c89a22fc920fbbda8bcd79aa3b86add4.tar.gz",
+            "https://github.com/grpc/grpc/archive/8871dab19b4ab5389e28474d25cfeea61283265c.tar.gz",
         ],
     )
 
@@ -86,21 +104,6 @@ def register_http_archive_dependencies():
         url = "https://github.com/bazelbuild/rules_scala/archive/%s.zip" % RULES_SCALA_VERSION,
     )
 
-    http_archive(
-        name = "rules_rust",
-        sha256 = "50ec4b84a7ec5370f5882d52f4a1e6b8a75de2f8dcc0a4403747b69b2c4ef5b1",
-        urls = ["https://github.com/bazelbuild/rules_rust/releases/download/0.23.0/rules_rust-v0.23.0.tar.gz"],
-    )
-
-    http_archive(
-        name = "com_github_bazelbuild_buildtools",
-        sha256 = "977a0bd4593c8d4c8f45e056d181c35e48aa01ad4f8090bdb84f78dca42f47dc",
-        strip_prefix = "buildtools-6.1.2",
-        urls = [
-            "https://github.com/bazelbuild/buildtools/archive/refs/tags/v6.1.2.tar.gz",
-        ],
-    )
-
     http_archive(
         name = "hedron_compile_commands",
         sha256 = "3cd0e49f0f4a6d406c1d74b53b7616f5e24f5fd319eafc1bf8eee6e14124d115",

cpp/example_service/BUILD.bazel

@@ -3,7 +3,7 @@ cc_binary(
     srcs = ["example_service.cc"],
     visibility = ["//visibility:public"],
     deps = [
-        "//protos:example_service_proto",
+        "//protos/example_cc_grpc:example_service_proto",
         "@com_github_grpc_grpc//:grpc++",
         "@com_github_grpc_grpc//:grpc++_reflection",
         "@com_google_absl//absl/flags:flag",

cpp/example_service/example_service.cc

@@ -7,7 +7,7 @@
 #include <string>
 
 #include "absl/strings/str_format.h"
-#include "protos/example_service.grpc.pb.h"
+#include "protos/example_cc_grpc/example_service.grpc.pb.h"
 
 using example_service::Greeter;
 using example_service::HelloReply;

cpp/golf_service/BUILD.bazel

@@ -20,7 +20,6 @@ cc_test(
 
 cc_library(
     name = "api",
-    srcs = ["api.cc"],
     hdrs = ["api.h"],
     deps = [
         "//cpp/cards/golf",
@@ -38,8 +37,10 @@ cc_binary(
         ":api",
         ":game_state_mapper",
         "//cpp/cards/golf",
+        "//protos/golf_ws:golf_cc_proto",
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/strings",
+        "@com_google_protobuf//:protobuf",
         "@mongoose_cc//:mongoose",
     ],
 )