Merge pull request 'Fix zig_exe location in Build struct' (#45) from asd/ziglings:main into main

Reviewed-on: https://codeberg.org/ziglings/exercises/pulls/45
This commit is contained in:
Chris Boesch 2024-02-06 18:36:50 +00:00
commit 4b1ae6117c
2 changed files with 4 additions and 4 deletions

View file

@ -386,7 +386,7 @@ const ZiglingStep = struct {
var zig_args = std.ArrayList([]const u8).init(b.allocator); var zig_args = std.ArrayList([]const u8).init(b.allocator);
defer zig_args.deinit(); defer zig_args.deinit();
zig_args.append(b.zig_exe) catch @panic("OOM"); zig_args.append(b.graph.zig_exe) catch @panic("OOM");
const cmd = switch (self.exercise.kind) { const cmd = switch (self.exercise.kind) {
.exe => "build-exe", .exe => "build-exe",

View file

@ -33,7 +33,7 @@ pub fn addCliTests(b: *std.Build, exercises: []const Exercise) *Step {
const n = ex.number(); const n = ex.number();
const cmd = b.addSystemCommand(&.{ const cmd = b.addSystemCommand(&.{
b.zig_exe, b.graph.zig_exe,
"build", "build",
"-Dhealed", "-Dhealed",
b.fmt("-Dhealed-path={s}", .{tmp_path}), b.fmt("-Dhealed-path={s}", .{tmp_path}),
@ -69,7 +69,7 @@ pub fn addCliTests(b: *std.Build, exercises: []const Exercise) *Step {
// TODO: when an exercise is modified, the cache is not invalidated. // TODO: when an exercise is modified, the cache is not invalidated.
const cmd = b.addSystemCommand(&.{ const cmd = b.addSystemCommand(&.{
b.zig_exe, b.graph.zig_exe,
"build", "build",
"-Dhealed", "-Dhealed",
b.fmt("-Dhealed-path={s}", .{tmp_path}), b.fmt("-Dhealed-path={s}", .{tmp_path}),
@ -99,7 +99,7 @@ pub fn addCliTests(b: *std.Build, exercises: []const Exercise) *Step {
const n = ex.number(); const n = ex.number();
const cmd = b.addSystemCommand(&.{ const cmd = b.addSystemCommand(&.{
b.zig_exe, b.graph.zig_exe,
"build", "build",
b.fmt("-Dn={}", .{n}), b.fmt("-Dn={}", .{n}),
}); });