Skip to content

Commit 043697a

Browse files
committed
update build-commit script to 0.15.x
1 parent 19abc3d commit 043697a

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

.github/workflows/build-commit.zig

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,9 @@ fn zigVer(env_map: *const std.process.EnvMap, dir: std.fs.Dir) ![]const u8 {
445445

446446
const ancestor_ver = try std.SemanticVersion.parse(tagged_ancestor);
447447
if (zig_version.order(ancestor_ver) != .gt) {
448-
fatal("Zig version '{}' must be greater than tagged ancestor '{}'", .{ zig_version, ancestor_ver });
448+
fatal("Zig version '{f}' must be greater than tagged ancestor '{f}'", .{
449+
zig_version, ancestor_ver,
450+
});
449451
}
450452

451453
// Check that the commit hash is prefixed with a 'g' (a Git convention).
@@ -513,16 +515,16 @@ fn allocPrintCmd(argv: []const []const u8) []u8 {
513515
}
514516

515517
fn fetch(url: []const u8, headers: std.http.Client.Request.Headers, extra_headers: []const std.http.Header) ![]u8 {
516-
var response: std.ArrayList(u8) = .init(arena);
518+
var response: std.Io.Writer.Allocating = .init(arena);
517519
var client: std.http.Client = .{ .allocator = arena };
518520
const result = try client.fetch(.{
519521
.location = .{ .url = url },
520-
.response_storage = .{ .dynamic = &response },
522+
.response_writer = &response.writer,
521523
.headers = headers,
522524
.extra_headers = extra_headers,
523525
});
524-
if (result.status != .ok) fatal("fetch from {s} result: {s}", .{ url, @tagName(result.status) });
525-
return response.items;
526+
if (result.status != .ok) fatal("fetch from {s} result: {t}", .{ url, result.status });
527+
return response.written();
526528
}
527529

528530
fn pluckLastSuccessFromJson(json_text: []const u8) []const u8 {
@@ -661,7 +663,7 @@ fn addTemplateEntry(
661663
const size = (try file.stat()).size;
662664
const digest = try sha256sum(file, size);
663665
try map.put(arena, print("{s}-tarball", .{name}), tarball_basename);
664-
try map.put(arena, print("{s}-shasum", .{name}), print("{}", .{std.fmt.fmtSliceHexLower(&digest)}));
666+
try map.put(arena, print("{s}-shasum", .{name}), print("{x}", .{&digest}));
665667
try map.put(arena, print("{s}-bytesize", .{name}), print("{d}", .{size}));
666668
}
667669

@@ -703,7 +705,7 @@ fn render(
703705
) !void {
704706
const in_contents = try std.fs.cwd().readFileAlloc(arena, in_file, 1 * 1024 * 1024);
705707

706-
var buffer = std.ArrayList(u8).init(arena);
708+
var buffer: std.Io.Writer.Allocating = .init(arena);
707709
defer buffer.deinit();
708710

709711
const State = enum {
@@ -712,7 +714,7 @@ fn render(
712714
VarName,
713715
EndBrace,
714716
};
715-
const writer = buffer.writer();
717+
const writer = &buffer.writer;
716718
var state = State.Start;
717719
var var_name_start: usize = undefined;
718720
var line: usize = 1;
@@ -742,7 +744,7 @@ fn render(
742744
const trimmed = mem.trim(u8, value, " \r\n");
743745
if (fmt == .html and mem.endsWith(u8, var_name, "bytesize")) {
744746
const size = try std.fmt.parseInt(u64, trimmed, 10);
745-
try writer.print("{:.1}", .{std.fmt.fmtIntSizeDec(size)});
747+
try writer.print("{Bi:.1}", .{size});
746748
} else {
747749
try writer.writeAll(trimmed);
748750
}
@@ -767,7 +769,7 @@ fn render(
767769
line += 1;
768770
}
769771
}
770-
try out_dir.writeFile(.{ .sub_path = out_file, .data = buffer.items });
772+
try out_dir.writeFile(.{ .sub_path = out_file, .data = buffer.written() });
771773
}
772774

773775
fn updateWebsiteRepo(

0 commit comments

Comments
 (0)