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
2 changes: 1 addition & 1 deletion .bazelrc.common
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ test --incompatible_exclusive_test_sandboxed
# docs: https://bazel.build/reference/command-line-reference#flag--enable_platform_specific_config
common --enable_platform_specific_config
# Enable persistent Zig cache directory within the sandbox,
# see https://github.com/aherrmann/rules_zig/issues/87,
# see https://github.com/hermeticbuild/rules_zig/issues/87,
# and https://github.com/uber/hermetic_cc_toolchain/issues/83.
# docs: https://bazel.build/reference/command-line-reference#flag--sandbox_add_mount_pair
build:linux --sandbox_add_mount_pair=/tmp
Expand Down
10 changes: 5 additions & 5 deletions .bazelrc.remote
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ build:remote-bes --experimental_profile_include_primary_output
build:remote-bes --nolegacy_important_outputs

# docs: https://bazel.build/reference/command-line-reference#flag--bes_results_url
build:remote-bes --bes_results_url=https://aherrmann.buildbuddy.io/invocation/
build:remote-bes --bes_results_url=https://hermeticbuild.buildbuddy.io/invocation/
# docs: https://bazel.build/reference/command-line-reference#flag--bes_backend
build:remote-bes --bes_backend=grpcs://aherrmann.buildbuddy.io
build:remote-bes --bes_backend=grpcs://hermeticbuild.buildbuddy.io

# Remote cache setup.

# docs: https://bazel.build/reference/command-line-reference#flag--remote_cache
build:remote-cache --remote_cache=grpcs://aherrmann.buildbuddy.io
build:remote-cache --remote_cache=grpcs://hermeticbuild.buildbuddy.io
# docs: https://bazel.build/reference/command-line-reference#flag--remote_cache_compression
build:remote-cache --remote_cache_compression
# docs: https://bazel.build/reference/command-line-reference#flag--remote_download_toplevel
Expand All @@ -36,9 +36,9 @@ build:remote-cache --experimental_remote_cache_lease_extension
# Remote execution setup.

# docs: https://bazel.build/reference/command-line-reference#flag--remote_executor
build:remote-exec --remote_executor=grpcs://aherrmann.buildbuddy.io
build:remote-exec --remote_executor=grpcs://hermeticbuild.buildbuddy.io
# docs: https://bazel.build/reference/command-line-reference#flag--experimental_remote_downloader
build:remote-exec --experimental_remote_downloader=grpcs://aherrmann.buildbuddy.io
build:remote-exec --experimental_remote_downloader=grpcs://hermeticbuild.buildbuddy.io

# docs: https://bazel.build/reference/command-line-reference#flag--jobs
build:remote-exec --jobs=80
Expand Down
4 changes: 2 additions & 2 deletions .bcr/metadata.template.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"homepage": "https://github.com/aherrmann/rules_zig",
"homepage": "https://github.com/hermeticbuild/rules_zig",
"maintainers": [
{
"name": "Andreas Herrmann",
Expand All @@ -8,7 +8,7 @@
"github_user_id": 732652
}
],
"repository": ["github:aherrmann/rules_zig"],
"repository": ["github:hermeticbuild/rules_zig"],
"versions": [],
"yanked_versions": {}
}
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ jobs:
buildbuddyApiKey: ${{ secrets.BUILDBUDDY_API_KEY || '' }}

# Zig documentation builds are separated to work around the following issue:
# https://github.com/aherrmann/rules_zig/issues/273
# https://github.com/hermeticbuild/rules_zig/issues/273
#test-zig-docs:
# # The type of runner that the job will run on
# runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -209,7 +209,7 @@ jobs:
# targetPattern: ${{ matrix.targetPattern }}
# tagFilters: ${{ matrix.tagFilters }}
# # Disable remote execution and avoid concurrency to work around
# # https://github.com/aherrmann/rules_zig/issues/273
# # https://github.com/hermeticbuild/rules_zig/issues/273
# remoteEnabled: false
# bazelFlags: "--jobs=1"
# buildbuddyApiKey: ${{ secrets.BUILDBUDDY_API_KEY }}
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Take a look at the [planned functionality][planned-functionality] tracking
issue to get a picture of which functionality is already implemented and what
is still missing.

[planned-functionality]: https://github.com/aherrmann/rules_zig/issues/1
[planned-functionality]: https://github.com/hermeticbuild/rules_zig/issues/1

## Motivation

Expand Down Expand Up @@ -62,7 +62,7 @@ Note, the old WORKSPACE mechanmism is no longer supported by rules_zig.
To install a [release version of rules_zig][rules-zig-releases] follow the
installation instructions given in the corresponding release notes.

[rules-zig-releases]: https://github.com/aherrmann/rules_zig/releases
[rules-zig-releases]: https://github.com/hermeticbuild/rules_zig/releases

To install a development version add the following to your MODULE.bazel file:

Expand All @@ -72,7 +72,7 @@ archive_override(
module_name = "rules_zig",
integrity = "sha256-$SHA256",
strip_prefix = "rules_zig-$COMMIT",
urls = ["https://github.com/aherrmann/rules_zig/archive/$COMMIT.tar.gz"],
urls = ["https://github.com/hermeticbuild/rules_zig/archive/$COMMIT.tar.gz"],
)
```

Expand All @@ -83,7 +83,7 @@ information.
[archive-override-doc]: https://bazel.build/versions/7.0.0/rules/lib/globals/module#archive_override

<!-- TODO[AH] Write a user-guide
https://github.com/aherrmann/rules_zig/issues/59
https://github.com/hermeticbuild/rules_zig/issues/59

## User Guide Documentation

Expand Down Expand Up @@ -120,7 +120,7 @@ them through Bazel by using the `--repo_env` flag.
## Usage Examples

<!-- TODO[AH] Create an instructive example.
https://github.com/aherrmann/rules_zig/issues/58
https://github.com/hermeticbuild/rules_zig/issues/58
-->

Examples can be found among the end-to-end tests under
Expand Down
3 changes: 1 addition & 2 deletions e2e/workspace/toolchain-glibc-version/README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
By default, `rules_zig` targets a "lowest common denominator" glibc version to ensure broad compatibility. You can find the discussion behind this choice in [this PR](https://github.com/aherrmann/rules_zig/pull/299) and see the implementation [here](https://github.com/aherrmann/rules_zig/blob/main/zig/target/BUILD.bazel#L56).
By default, `rules_zig` targets a "lowest common denominator" glibc version to ensure broad compatibility. You can find the discussion behind this choice in [this PR](https://github.com/hermeticbuild/rules_zig/pull/299) and see the implementation [here](https://github.com/hermeticbuild/rules_zig/blob/main/zig/target/BUILD.bazel#L56).

This example project demonstrates how to manually configure and use a specific glibc version with `rules_zig`.


```bash
# navigate to the workspace directory:
cd e2e/workspace
Expand Down
2 changes: 1 addition & 1 deletion zig/private/repo/zig_repository.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def _get_integrity_args(*, sha256, integrity):
def _mirrors_urls(url, mirrors):
filename = _basename(url)
return [
mirror + "/" + filename + "?source=github-aherrmann-rules_zig"
mirror + "/" + filename + "?source=github-hermeticbuild-rules_zig"
for mirror in mirrors
] + [url]

Expand Down
2 changes: 1 addition & 1 deletion zig/private/zig_toolchain_header.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ TOOLCHAINS = [
def max_int_alignment(arch):
"""Architecture specific maximum integer alignment.

See https://github.com/aherrmann/zig/blob/5ad91a646a753cc3eecd8751e61cf458dadd9ac4/src/Type.zig#L1641
See https://github.com/ziglang/zig/blob/5ad91a646a753cc3eecd8751e61cf458dadd9ac4/src/Type.zig#L1641
"""
by_arch = {
"avr": 1,
Expand Down
6 changes: 3 additions & 3 deletions zig/tests/integration_tests/integration_tests_runner.zig
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ fn testBinaryShouldNotContainOutputBase(mode: []const u8) !void {
test "zig_binary result should not contain the output base path in debug mode" {
if (true) {
// TODO[AH] Avoid output base path in debug mode.
// See https://github.com/aherrmann/rules_zig/issues/79
// See https://github.com/hermeticbuild/rules_zig/issues/79
return error.SkipZigTest;
}

Expand All @@ -202,7 +202,7 @@ test "zig_binary result should not contain the output base path in debug mode" {
test "zig_binary result should not contain the output base path in release_safe mode" {
if (true) {
// TODO[AH] Avoid output base path in release_safe mode.
// See https://github.com/aherrmann/rules_zig/issues/79
// See https://github.com/hermeticbuild/rules_zig/issues/79
return error.SkipZigTest;
}

Expand All @@ -216,7 +216,7 @@ test "zig_binary result should not contain the output base path in release_small
test "zig_binary result should not contain the output base path in release_fast mode" {
if (true) {
// TODO[AH] Avoid output base path in release_fast mode.
// See https://github.com/aherrmann/rules_zig/issues/79
// See https://github.com/hermeticbuild/rules_zig/issues/79
return error.SkipZigTest;
}

Expand Down
2 changes: 1 addition & 1 deletion zig/tests/integration_tests/mirrors_tests_runner.zig
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ test "Zig distribution is fetched from a mirror" {
if (url_value == .string) {
if (std.mem.startsWith(u8, url_value.string, expected_url_prefix)) {
fetch_used_mirror = true;
fetch_used_source_param = std.mem.endsWith(u8, url_value.string, "?source=github-aherrmann-rules_zig");
fetch_used_source_param = std.mem.endsWith(u8, url_value.string, "?source=github-hermeticbuild-rules_zig");
}
}
}
Expand Down
Loading