Skip to content

Commit

Permalink
Merge pull request #91 from meroton/main
Browse files Browse the repository at this point in the history
Integrate bb-browser and bb-scheduler web interface into bb-portal
  • Loading branch information
trey-ivy authored Mar 4, 2025
2 parents 94f72e8 + bc7d4f8 commit 2a81922
Show file tree
Hide file tree
Showing 177 changed files with 52,997 additions and 3,048 deletions.
1 change: 1 addition & 0 deletions .bazelignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
bazel-demo
third_party/bazel/_generate-via-bazel
frontend/node_modules
8 changes: 8 additions & 0 deletions BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,26 @@
load("@com_github_bazelbuild_buildtools//buildifier:def.bzl", "buildifier")
load("@gazelle//:def.bzl", "gazelle")

# gazelle:exclude frontend/src/proto
# gazelle:go_grpc_compilers @rules_go//proto:go_proto,@rules_go//proto:go_grpc_v2
# gazelle:prefix github.com/buildbarn/bb-portal
# gazelle:go_naming_convention_external import
# gazelle:resolve proto go build/bazel/remote/execution/v2/remote_execution.proto @bazel_remote_apis//build/bazel/remote/execution/v2:remote_execution_go_proto
# gazelle:resolve proto go google/rpc/status.proto @org_golang_google_genproto_googleapis_rpc//status
# gazelle:resolve proto go pkg/proto/configuration/auth/auth.proto @com_github_buildbarn_bb_storage//pkg/proto/configuration/auth
# gazelle:resolve proto go pkg/proto/configuration/blobstore/blobstore.proto @com_github_buildbarn_bb_storage//pkg/proto/configuration/blobstore
# gazelle:resolve proto go pkg/proto/configuration/global/global.proto @com_github_buildbarn_bb_storage//pkg/proto/configuration/global
# gazelle:resolve proto go pkg/proto/configuration/grpc/grpc.proto @com_github_buildbarn_bb_storage//pkg/proto/configuration/grpc
# gazelle:resolve proto go pkg/proto/configuration/http/http.proto @com_github_buildbarn_bb_storage//pkg/proto/configuration/http
# gazelle:resolve proto build/bazel/remote/execution/v2/remote_execution.proto @bazel_remote_apis//build/bazel/remote/execution/v2:remote_execution_proto
# gazelle:resolve proto google/rpc/status.proto @googleapis//google/rpc:status_proto
# gazelle:resolve proto pkg/proto/configuration/auth/auth.proto @com_github_buildbarn_bb_storage//pkg/proto/configuration/auth:auth_proto
# gazelle:resolve proto pkg/proto/configuration/blobstore/blobstore.proto @com_github_buildbarn_bb_storage//pkg/proto/configuration/blobstore:blobstore_proto
# gazelle:resolve proto pkg/proto/configuration/global/global.proto @com_github_buildbarn_bb_storage//pkg/proto/configuration/global:global_proto
# gazelle:resolve proto pkg/proto/configuration/grpc/grpc.proto @com_github_buildbarn_bb_storage//pkg/proto/configuration/grpc:grpc_proto
# gazelle:resolve proto pkg/proto/configuration/http/http.proto @com_github_buildbarn_bb_storage//pkg/proto/configuration/http:http_proto
# gazelle:resolve go github.com/buildbarn/bb-portal/pkg/proto/configuration/bb_portal //pkg/proto/configuration/bb_portal
# gazelle:resolve go github.com/bazelbuild/remote-apis/build/bazel/remote/execution/v2 @bazel_remote_apis//build/bazel/remote/execution/v2:remote_execution_go_proto
gazelle(
name = "gazelle",
)
Expand Down
27 changes: 27 additions & 0 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
module(name = "com_github_buildbarn_bb_portal")

bazel_dep(name = "bazel_remote_apis", version = "0.0.0")
bazel_dep(name = "com_github_buildbarn_bb_remote_execution")
bazel_dep(name = "com_github_buildbarn_bb_storage")
bazel_dep(name = "com_github_buildbarn_go_xdr")
bazel_dep(name = "gazelle", version = "0.38.0")
bazel_dep(name = "googleapis", version = "0.0.0-20240819-fe8ba054a")
bazel_dep(name = "googletest", version = "1.15.2")
Expand All @@ -21,6 +23,12 @@ git_override(
remote = "https://github.com/bazelbuild/remote-apis.git",
)

git_override(
module_name = "com_github_buildbarn_bb_remote_execution",
commit = "853626adcafd25a948f90b05a251bfba9a0e236f",
remote = "https://github.com/buildbarn/bb-remote-execution.git",
)

git_override(
module_name = "com_github_buildbarn_bb_storage",
commit = "0941111f29e31905e4081e6262bccf0c123940ed",
Expand All @@ -31,6 +39,22 @@ git_override(
remote = "https://github.com/buildbarn/bb-storage.git",
)

git_override(
module_name = "com_github_buildbarn_go_xdr",
commit = "236788cf9e8948a1e8875c7dd243e2be180cdfd7",
remote = "https://github.com/buildbarn/go-xdr.git",
)

git_override(
module_name = "rules_antlr",
commit = "89a29cca479363a5aee53e203719510bdc6be6ff",
patches = [
"//:patches/rules_antlr/antlr-4.10.diff",
"//:patches/rules_antlr/bzlmod.diff",
],
remote = "https://github.com/marcohu/rules_antlr.git",
)

git_override(
module_name = "gazelle",
commit = "4d0129d7adae33e8e648d3624aff8fa8f93f375b",
Expand Down Expand Up @@ -65,7 +89,9 @@ use_repo(
"com_github_gorilla_mux",
"com_github_hashicorp_go_multierror",
"com_github_hedwigz_entviz",
"com_github_improbable_eng_grpc_web",
"com_github_jackc_pgx_v5",
"com_github_jmespath_go_jmespath",
"com_github_machinebox_graphql",
"com_github_mattn_go_sqlite3",
"com_github_pkg_errors",
Expand All @@ -75,6 +101,7 @@ use_repo(
"io_entgo_ent",
"org_golang_google_api",
"org_golang_google_genproto",
"org_golang_google_genproto_googleapis_bytestream",
"org_golang_google_grpc",
"org_golang_google_protobuf",
"org_golang_x_lint",
Expand Down
Loading

0 comments on commit 2a81922

Please sign in to comment.