Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .bazelrc.remote
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,11 @@ build:remote-exec --experimental_remote_downloader=grpcs://aherrmann.buildbuddy.
# docs: https://bazel.build/reference/command-line-reference#flag--jobs
build:remote-exec --jobs=80

# use BuildBuddy platform on remote builds
# docs: https://bazel.build/reference/command-line-reference#flag--extra_execution_platforms
build:remote-exec --extra_execution_platforms=@buildbuddy_toolchain//:platform
# docs: https://bazel.build/reference/command-line-reference#flag--extra_toolchains
build:remote-exec --extra_toolchains=@buildbuddy_toolchain//:cc_toolchain
# prefer host platform on non-remote builds
# docs: https://bazel.build/reference/command-line-reference#flag--extra_execution_platforms
build:local --extra_execution_platforms=@local_config_platform//:host
23 changes: 23 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,28 @@
# How to Contribute

## Building

To build with remote execution enabled, add the following to `.bazelrc.user`:

```
build --config=remote
build --remote_header=x-buildbuddy-api-key=YOUR_TOKEN
```

To build locally instead, add the following to `.bazelrc.user`:

```
build --config=local
```

Build and test:

```
$ bazel test //...
$ bazel test //zig/tests/integration_tests
$ cd e2e/workspace; bazel test //...
```

## Committing

Follow [conventional commits](https://www.conventionalcommits.org/en/v1.0.0/)
Expand Down
16 changes: 15 additions & 1 deletion MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,22 @@ zig_dev.toolchain(zig_version = "0.12.1")
zig_dev.toolchain(zig_version = "0.12.0")
zig_dev.toolchain(zig_version = "0.11.0")

bazel_dep(name = "toolchains_buildbuddy", dev_dependency = True)
archive_override(
module_name = "toolchains_buildbuddy",
integrity = "sha256-HupO9xeeYDAybxZiXmUFk6W5bAlNnM3c2e8cwkutEpc=",
strip_prefix = "buildbuddy-toolchain-eb143d1cf81dcc3ddbf0be5b9950cf8c14aa2de9",
urls = "https://github.com/buildbuddy-io/buildbuddy-toolchain/archive/eb143d1cf81dcc3ddbf0be5b9950cf8c14aa2de9.tar.gz",
)

buildbuddy = use_extension(
"@toolchains_buildbuddy//:extensions.bzl",
"buildbuddy",
dev_dependency = True,
)
use_repo(buildbuddy, "buildbuddy_toolchain")

bazel_dep(name = "rules_cc", version = "0.0.13", dev_dependency = True)
bazel_dep(name = "protobuf", version = "28.3", dev_dependency = True) # for buildbuddy toolchain
bazel_dep(name = "stardoc", version = "0.7.1", dev_dependency = True, repo_name = "io_bazel_stardoc")
bazel_dep(name = "gazelle", version = "0.39.1", dev_dependency = True, repo_name = "bazel_gazelle")
bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.7.1", dev_dependency = True)
Expand Down
12 changes: 0 additions & 12 deletions WORKSPACE.bzlmod
Original file line number Diff line number Diff line change
@@ -1,12 +0,0 @@
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

http_archive(
name = "io_buildbuddy_buildbuddy_toolchain",
sha256 = "1eea4ef7179e6030326f16625e650593a5b96c094d9ccddcd9ef1cc24bad1297",
strip_prefix = "buildbuddy-toolchain-eb143d1cf81dcc3ddbf0be5b9950cf8c14aa2de9",
urls = ["https://github.com/buildbuddy-io/buildbuddy-toolchain/archive/eb143d1cf81dcc3ddbf0be5b9950cf8c14aa2de9.tar.gz"],
)

load("@io_buildbuddy_buildbuddy_toolchain//:rules.bzl", "buildbuddy")

buildbuddy(name = "buildbuddy_toolchain")
16 changes: 15 additions & 1 deletion e2e/workspace/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ bazel_dep(name = "rules_zig", version = "0.0.0", dev_dependency = True)
bazel_dep(name = "aspect_bazel_lib", version = "2.9.4", dev_dependency = True)
bazel_dep(name = "bazel_skylib", version = "1.7.1", dev_dependency = True)
bazel_dep(name = "platforms", version = "0.0.10", dev_dependency = True)
bazel_dep(name = "protobuf", version = "28.3", dev_dependency = True) # for buildbuddy toolchain
bazel_dep(name = "rules_cc", version = "0.0.13", dev_dependency = True)

local_path_override(
Expand All @@ -21,6 +20,21 @@ zig.toolchain(zig_version = "0.12.0")
zig.toolchain(zig_version = "0.11.0")
use_repo(zig, "zig_toolchains")

bazel_dep(name = "toolchains_buildbuddy", dev_dependency = True)
archive_override(
module_name = "toolchains_buildbuddy",
integrity = "sha256-HupO9xeeYDAybxZiXmUFk6W5bAlNnM3c2e8cwkutEpc=",
strip_prefix = "buildbuddy-toolchain-eb143d1cf81dcc3ddbf0be5b9950cf8c14aa2de9",
urls = "https://github.com/buildbuddy-io/buildbuddy-toolchain/archive/eb143d1cf81dcc3ddbf0be5b9950cf8c14aa2de9.tar.gz",
)

buildbuddy = use_extension(
"@toolchains_buildbuddy//:extensions.bzl",
"buildbuddy",
dev_dependency = True,
)
use_repo(buildbuddy, "buildbuddy_toolchain")

bazel_dep(name = "runfiles_library_dependency", dev_dependency = True)
local_path_override(
module_name = "runfiles_library_dependency",
Expand Down
13 changes: 0 additions & 13 deletions e2e/workspace/WORKSPACE.bzlmod
Original file line number Diff line number Diff line change
@@ -1,15 +1,2 @@
# When --enable_bzlmod is set, this file replaces WORKSPACE.bazel.
# Dependencies then come from MODULE.bazel instead.

load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

http_archive(
name = "io_buildbuddy_buildbuddy_toolchain",
sha256 = "1eea4ef7179e6030326f16625e650593a5b96c094d9ccddcd9ef1cc24bad1297",
strip_prefix = "buildbuddy-toolchain-eb143d1cf81dcc3ddbf0be5b9950cf8c14aa2de9",
urls = ["https://github.com/buildbuddy-io/buildbuddy-toolchain/archive/eb143d1cf81dcc3ddbf0be5b9950cf8c14aa2de9.tar.gz"],
)

load("@io_buildbuddy_buildbuddy_toolchain//:rules.bzl", "buildbuddy")

buildbuddy(name = "buildbuddy_toolchain")
15 changes: 15 additions & 0 deletions zig/tests/integration_tests/workspace/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,18 @@ zig.toolchain(zig_version = "0.12.1")
zig.toolchain(zig_version = "0.12.0")
zig.toolchain(zig_version = "0.11.0")
use_repo(zig, "zig_toolchains")

bazel_dep(name = "toolchains_buildbuddy", dev_dependency = True)
archive_override(
module_name = "toolchains_buildbuddy",
integrity = "sha256-HupO9xeeYDAybxZiXmUFk6W5bAlNnM3c2e8cwkutEpc=",
strip_prefix = "buildbuddy-toolchain-eb143d1cf81dcc3ddbf0be5b9950cf8c14aa2de9",
urls = "https://github.com/buildbuddy-io/buildbuddy-toolchain/archive/eb143d1cf81dcc3ddbf0be5b9950cf8c14aa2de9.tar.gz",
)

buildbuddy = use_extension(
"@toolchains_buildbuddy//:extensions.bzl",
"buildbuddy",
dev_dependency = True,
)
use_repo(buildbuddy, "buildbuddy_toolchain")
12 changes: 0 additions & 12 deletions zig/tests/integration_tests/workspace/WORKSPACE.bzlmod
Original file line number Diff line number Diff line change
@@ -1,12 +0,0 @@
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

http_archive(
name = "io_buildbuddy_buildbuddy_toolchain",
sha256 = "69f605320bed81fc11f1ab69bd76bd7199eca25c7d554504029c85b0a2ebb9af",
strip_prefix = "buildbuddy-toolchain-5bf0572e5a9c1e99fddb8e282e9a4cb6734ecd79",
urls = ["https://github.com/buildbuddy-io/buildbuddy-toolchain/archive/5bf0572e5a9c1e99fddb8e282e9a4cb6734ecd79.tar.gz"],
)

load("@io_buildbuddy_buildbuddy_toolchain//:rules.bzl", "buildbuddy")

buildbuddy(name = "buildbuddy_toolchain")
Loading