a/ziglings
1
0
Fork 0
mirror of https://codeberg.org/andyscott/ziglings.git synced 2024-11-09 11:40:46 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request 'fixed build: renamed child.exec to run' (#19) from fix_build into main

Browse source 
Reviewed-on: https://codeberg.org/ziglings/exercises/pulls/19
This commit is contained in:
Chris Boesch 2023-10-24 10:42:25 +00:00
commit 08d294f2b8
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
README.md
View file

@ -95,7 +95,8 @@ that if you update one, you may need to also update the other.
### Version Changes ### Version Changes
Version-0.11.0-dev.4246+71dfce31b Version-0.12.0-dev.1243
* *2023-10-24* zig 0.12.0-dev.1243 - changes in `std.ChildProcess`: renamed exec to run - see[#5853](https://github.com/ziglang/zig/issues/5853)
* *2023-06-26* zig 0.11.0-dev.4246 - changes in compile step (now it can be null) * *2023-06-26* zig 0.11.0-dev.4246 - changes in compile step (now it can be null)
* *2023-06-26* zig 0.11.0-dev.3853 - removal of destination type from all cast builtins * *2023-06-26* zig 0.11.0-dev.3853 - removal of destination type from all cast builtins
* *2023-06-20* zig 0.11.0-dev.3747 - `@enumToInt` is now `@intFromEnum` and `@intToFloat` is now `@floatFromInt` * *2023-06-20* zig 0.11.0-dev.3747 - `@enumToInt` is now `@intFromEnum` and `@intToFloat` is now `@floatFromInt`

8
build.zig
View file

@ -15,7 +15,7 @@ const print = std.debug.print;
// 1) Getting Started // 1) Getting Started
// 2) Version Changes // 2) Version Changes
comptime { comptime {
const required_zig = "0.11.0-dev.4246"; const required_zig = "0.12.0-dev.1243";
const current_zig = builtin.zig_version; const current_zig = builtin.zig_version;
const min_zig = std.SemanticVersion.parse(required_zig) catch unreachable; const min_zig = std.SemanticVersion.parse(required_zig) catch unreachable;
if (current_zig.order(min_zig) == .lt) { if (current_zig.order(min_zig) == .lt) {
@ -288,7 +288,7 @@ const ZiglingStep = struct {
// Allow up to 1 MB of stdout capture. // Allow up to 1 MB of stdout capture.
const max_output_bytes = 1 * 1024 * 1024; const max_output_bytes = 1 * 1024 * 1024;
var result = Child.exec(.{ var result = Child.run(.{
.allocator = b.allocator, .allocator = b.allocator,
.argv = &.{exe_path}, .argv = &.{exe_path},
.cwd = b.build_root.path.?, .cwd = b.build_root.path.?,
@ -306,7 +306,7 @@ const ZiglingStep = struct {
} }
} }
fn check_output(self: *ZiglingStep, result: Child.ExecResult) !void { fn check_output(self: *ZiglingStep, result: Child.RunResult) !void {
const b = self.step.owner; const b = self.step.owner;
// Make sure it exited cleanly. // Make sure it exited cleanly.
@ -355,7 +355,7 @@ const ZiglingStep = struct {
print("{s}PASSED:\n{s}{s}\n\n", .{ green_text, output, reset_text }); print("{s}PASSED:\n{s}{s}\n\n", .{ green_text, output, reset_text });
} }
fn check_test(self: *ZiglingStep, result: Child.ExecResult) !void { fn check_test(self: *ZiglingStep, result: Child.RunResult) !void {
switch (result.term) { switch (result.term) {
.Exited => |code| { .Exited => |code| {
if (code != 0) { if (code != 0) {