From b434197fe80d261c8ec5a4a3bc7baeb79bd6f984 Mon Sep 17 00:00:00 2001 From: Meghan Date: Thu, 13 Oct 2022 09:44:25 -0700 Subject: [PATCH 1/3] build.zig: ensure user zig matches program minimum --- build.zig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build.zig b/build.zig index cb89b85..b55a13b 100644 --- a/build.zig +++ b/build.zig @@ -5,6 +5,10 @@ const shared = @import("src/shared.zig"); const zls_version = std.builtin.Version{ .major = 0, .minor = 10, .patch = 0 }; pub fn build(b: *std.build.Builder) !void { + const current_zig = builtin.zig_version; + const min_zig = std.SemanticVersion.parse("0.10.0-dev.4057+349d78a44") catch return; // std.zig.tokenizer.Token.Tag.number_literal added + if (current_zig.order(min_zig).compare(.lt)) @panic(exe.builder.fmt("Your Zig version v{} does not meet the minimum build requirement of v{}", .{current, min})); + const target = b.standardTargetOptions(.{}); const mode = b.standardReleaseOptions(); From e1c86158cc585a4f2eb09f343f38d1c3bdb9d70c Mon Sep 17 00:00:00 2001 From: Meghan Date: Thu, 13 Oct 2022 09:47:22 -0700 Subject: [PATCH 2/3] fix CI oops --- build.zig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.zig b/build.zig index b55a13b..06ddca5 100644 --- a/build.zig +++ b/build.zig @@ -7,7 +7,7 @@ const zls_version = std.builtin.Version{ .major = 0, .minor = 10, .patch = 0 }; pub fn build(b: *std.build.Builder) !void { const current_zig = builtin.zig_version; const min_zig = std.SemanticVersion.parse("0.10.0-dev.4057+349d78a44") catch return; // std.zig.tokenizer.Token.Tag.number_literal added - if (current_zig.order(min_zig).compare(.lt)) @panic(exe.builder.fmt("Your Zig version v{} does not meet the minimum build requirement of v{}", .{current, min})); + if (current_zig.order(min_zig).compare(.lt)) @panic(b.fmt("Your Zig version v{} does not meet the minimum build requirement of v{}", .{current, min})); const target = b.standardTargetOptions(.{}); From 7aa8f839f1ae86e4f410167e328c92514c01454f Mon Sep 17 00:00:00 2001 From: Meghan Date: Thu, 13 Oct 2022 09:49:09 -0700 Subject: [PATCH 3/3] ci fix --- build.zig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.zig b/build.zig index 06ddca5..1d33de7 100644 --- a/build.zig +++ b/build.zig @@ -7,7 +7,7 @@ const zls_version = std.builtin.Version{ .major = 0, .minor = 10, .patch = 0 }; pub fn build(b: *std.build.Builder) !void { const current_zig = builtin.zig_version; const min_zig = std.SemanticVersion.parse("0.10.0-dev.4057+349d78a44") catch return; // std.zig.tokenizer.Token.Tag.number_literal added - if (current_zig.order(min_zig).compare(.lt)) @panic(b.fmt("Your Zig version v{} does not meet the minimum build requirement of v{}", .{current, min})); + if (current_zig.order(min_zig).compare(.lt)) @panic(b.fmt("Your Zig version v{} does not meet the minimum build requirement of v{}", .{current_zig, min_zig})); const target = b.standardTargetOptions(.{});