neurocyte/flow
neurocyte/flow
1
1
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

build: update build to zig-0.15.1

Browse source
This commit is contained in:
CJ van den Berg 2025-08-22 13:16:20 +02:00
parent 55a862eac0
commit b6d4935303
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
2 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

34
build.zig
View file

@ -17,11 +17,11 @@ pub fn build(b: *std.Build) void {
const test_step = b.step("test", "Run unit tests"); const test_step = b.step("test", "Run unit tests");
const lint_step = b.step("lint", "Run lints"); const lint_step = b.step("lint", "Run lints");
var version = std.ArrayList(u8).init(b.allocator); var version: std.ArrayList(u8) = .empty;
defer version.deinit(); defer version.deinit(b.allocator);
gen_version(b, version.writer()) catch { gen_version(b, version.writer(b.allocator)) catch {
version.clearAndFree(); version.clearAndFree(b.allocator);
version.appendSlice("unknown") catch {}; version.appendSlice(b.allocator, "unknown") catch {};
}; };
return (if (release) &build_release else &build_development)( return (if (release) &build_release else &build_development)(
@ -225,11 +225,11 @@ pub fn build_exe(
else => std.debug.panic("makeDir(\".cache/cdb\") failed: {any}", .{e}), else => std.debug.panic("makeDir(\".cache/cdb\") failed: {any}", .{e}),
}; };
var version_info = std.ArrayList(u8).init(b.allocator); var version_info: std.ArrayList(u8) = .empty;
defer version_info.deinit(); defer version_info.deinit(b.allocator);
gen_version_info(b, target, version_info.writer(), optimize) catch { gen_version_info(b, target, version_info.writer(b.allocator), optimize) catch {
version_info.clearAndFree(); version_info.clearAndFree(b.allocator);
version_info.appendSlice("unknown") catch {}; version_info.appendSlice(b.allocator, "unknown") catch {};
}; };
const wf = b.addWriteFiles(); const wf = b.addWriteFiles();
@ -687,17 +687,17 @@ fn gen_version_info(
const branch_ = try b.runAllowFail(&[_][]const u8{ "git", "rev-parse", "--abbrev-ref", "HEAD" }, &code, .Ignore); const branch_ = try b.runAllowFail(&[_][]const u8{ "git", "rev-parse", "--abbrev-ref", "HEAD" }, &code, .Ignore);
const branch = std.mem.trimRight(u8, branch_, "\r\n "); const branch = std.mem.trimRight(u8, branch_, "\r\n ");
const tracking_branch_ = blk: { const tracking_branch_ = blk: {
var buf = std.ArrayList(u8).init(b.allocator); var buf: std.ArrayList(u8) = .empty;
defer buf.deinit(); defer buf.deinit(b.allocator);
try buf.appendSlice(branch); try buf.appendSlice(b.allocator, branch);
try buf.appendSlice("@{upstream}"); try buf.appendSlice(b.allocator, "@{upstream}");
break :blk (b.runAllowFail(&[_][]const u8{ "git", "rev-parse", "--abbrev-ref", buf.items }, &code, .Ignore) catch ""); break :blk (b.runAllowFail(&[_][]const u8{ "git", "rev-parse", "--abbrev-ref", buf.items }, &code, .Ignore) catch "");
}; };
const tracking_remote_name = if (std.mem.indexOfScalar(u8, tracking_branch_, '/')) |pos| tracking_branch_[0..pos] else ""; const tracking_remote_name = if (std.mem.indexOfScalar(u8, tracking_branch_, '/')) |pos| tracking_branch_[0..pos] else "";
const tracking_remote_ = if (tracking_remote_name.len > 0) blk: { const tracking_remote_ = if (tracking_remote_name.len > 0) blk: {
var remote_config_path = std.ArrayList(u8).init(b.allocator); var remote_config_path: std.ArrayList(u8) = .empty;
defer remote_config_path.deinit(); defer remote_config_path.deinit(b.allocator);
try remote_config_path.writer().print("remote.{s}.url", .{tracking_remote_name}); try remote_config_path.writer(b.allocator).print("remote.{s}.url", .{tracking_remote_name});
break :blk b.runAllowFail(&[_][]const u8{ "git", "config", remote_config_path.items }, &code, .Ignore) catch "(remote not found)"; break :blk b.runAllowFail(&[_][]const u8{ "git", "config", remote_config_path.items }, &code, .Ignore) catch "(remote not found)";
} else ""; } else "";
const remote_ = b.runAllowFail(&[_][]const u8{ "git", "config", "remote.origin.url" }, &code, .Ignore) catch "(origin not found)"; const remote_ = b.runAllowFail(&[_][]const u8{ "git", "config", "remote.origin.url" }, &code, .Ignore) catch "(origin not found)";

2
build.zig.version
View file

@ -1 +1 @@
0.15.0-dev.1034+bd97b6618 0.15.1