Skip to content

Commit

Permalink
scm: Update build to compile with latest master
Browse files Browse the repository at this point in the history
  • Loading branch information
mochalins committed May 11, 2024
1 parent bb19bee commit cbd63d7
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions build.zig
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ const zls_version = std.SemanticVersion{ .major = 0, .minor = 13, .patch = 0 };
const zls_version_is_tagged: bool = false;

/// Specify the minimum Zig version that is required to compile and test ZLS:
/// Rename Dir.writeFile2 -> Dir.writeFile and update all callsites
/// Build run step args uses `ArrayListUnmanaged`, update dependencies
///
/// Must match the `minimum_zig_version` in `build.zig.zon`.
const minimum_zig_version = "0.13.0-dev.68+b86c4bde6";
const minimum_zig_version = "0.13.0-dev.79+6bc0cef60";

/// Specify the minimum Zig version that is required to run ZLS:
/// Release 0.12.0
Expand Down Expand Up @@ -290,8 +290,8 @@ pub fn build(b: *Build) !void {
tests_run.has_side_effects = true;
src_tests_run.has_side_effects = true;

tests_run.argv.insertSlice(0, args) catch @panic("OOM");
src_tests_run.argv.insertSlice(0, args) catch @panic("OOM");
tests_run.argv.insertSlice(b.allocator, 0, args) catch @panic("OOM");
src_tests_run.argv.insertSlice(b.allocator, 0, args) catch @panic("OOM");

const merge_step = std.Build.Step.Run.create(b, "merge kcov");
merge_step.has_side_effects = true;
Expand Down
10 changes: 5 additions & 5 deletions build.zig.zon
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
// Must match the `zls_version` in `build.zig`
.version = "0.13.0-dev",
// Must match the `minimum_zig_version` in `build.zig`
.minimum_zig_version = "0.13.0-dev.68+b86c4bde6",
.minimum_zig_version = "0.13.0-dev.79+6bc0cef60",
// whenever the dependencies are updated, run `zon2nix > deps.nix`
.dependencies = .{
.known_folders = .{
.url = "https://github.com/ziglibs/known-folders/archive/bf79988adcfce166f848e4b11e718c1966365329.tar.gz",
.hash = "12201314cffeb40c5e4e3da166217d2c74628c74486414aaf97422bcd2279915b9fd",
.url = "https://github.com/ziglibs/known-folders/archive/2f9589a.tar.gz",
.hash = "12209cde192558f8b3dc098ac2330fc2a14fdd211c5433afd33085af75caa9183147",
},
.diffz = .{
.url = "https://github.com/ziglibs/diffz/archive/e10bf15962e45affb3fcd7d9a950977a69c901b3.tar.gz",
.hash = "12200d71e4b7029ea56a429e24260c6c0e85a3069b0d4ba85eace21a0fd75910aa64",
.url = "https://github.com/ziglibs/diffz/archive/c717774.tar.gz",
.hash = "1220102cb2c669d82184fb1dc5380193d37d68b54e8d75b76b2d155b9af7d7e2e76d",
},
},
.paths = .{""},
Expand Down

0 comments on commit cbd63d7

Please sign in to comment.