This repository has been archived by the owner on Sep 30, 2024. It is now read-only.
bazel: updates for hermetic_cc_toolchain + zig bump #59333
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Strum355
changed the title
|
Codenotify: Notifying subscribers in CODENOTIFY files for diff fffe80d...66c498b.
|
Comment on lines
+1
to
+22
| diff --git a/toolchain/zig-wrapper.zig b/toolchain/zig-wrapper.zig | ||
| index 4a0fab4..8a740f7 100644 | ||
| --- a/toolchain/zig-wrapper.zig | ||
| +++ b/toolchain/zig-wrapper.zig | ||
| @@ -328,7 +328,7 @@ test "zig-wrapper:parseArgs" { | ||
| // not using testing.allocator, because parseArgs is designed to be used | ||
| // with an arena. | ||
| var gpa = std.heap.GeneralPurposeAllocator(.{}){}; | ||
| - var allocator = gpa.allocator(); | ||
| + const allocator = gpa.allocator(); | ||
|
|
||
| const tests = [_]struct { | ||
| args: []const [:0]const u8, | ||
| @@ -428,7 +428,7 @@ test "zig-wrapper:parseArgs" { | ||
| try tmp.dir.makePath(dir); | ||
|
|
||
| var argv_it = TestArgIterator{ .argv = tt.args }; | ||
| - var res = try parseArgs(allocator, tmp.dir, &argv_it); | ||
| + const res = try parseArgs(allocator, tmp.dir, &argv_it); | ||
|
|
||
| switch (tt.want_result) { | ||
| .err => |want_msg| try testing.expectEqualStrings( |
There was a problem hiding this comment.
Why do we need a git diff/patch in here?
There was a problem hiding this comment.
This is uber/hermetic_cc_toolchain#140, hence "pr140"
jamesmcnamara
approved these changes
Jan 4, 2024
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes:
incompat-zig-linux-amd64bazel config--incompatible_enable_cc_toolchain_resolution--sandbox_add_mount_pair=/tmptodarwin-dockerbazel config as recommended for hermetic_cc_toolchaindarwin-dockerconfig to be closer to the version in our wolfi imagesTest plan
bazel build //docker-images/syntax-highlighter:syntect_server --config=darwin-dockerwith various combinations ofbazel clean,bazel clean --expungeandrm -rf /tmp/zig-cachebazel test //docker-images/syntax-highlighter:image_test --config=darwin-docker