Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ jobs:
check:
uses: fizzyedit/plugin-build-action/.github/workflows/check.yml@v7
with:
zig-version: "0.16.0"
zig-version: "0.17.0"
# secrets:
# build_env: ${{ secrets.MY_BUILD_ENV }} # as in release.yml, if the build needs one
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ jobs:
permissions:
contents: write
with:
zig-version: "0.16.0"
zig-version: "0.17.0"
2 changes: 1 addition & 1 deletion .github/workflows/sdk-repin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ jobs:
with:
sdk-version: ${{ github.event.client_payload.version || inputs.sdk-version || '' }}
force: ${{ inputs.force == true }}
zig-version: "0.16.0"
zig-version: "0.17.0"
6 changes: 3 additions & 3 deletions build.zig.zon
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.{
.name = .zig,
.version = "0.0.1",
.minimum_zig_version = "0.16.0",
.minimum_zig_version = "0.17.0",
.paths = .{
"build.zig",
"build.zig.zon",
Expand All @@ -17,8 +17,8 @@
// The published SDK, not a path into a checkout: a release has to build from a
// clean clone, and the release asset (never the tag's git archive) is the SDK
// package alone — the monorepo root zon carries the app's own dependencies.
.url = "https://github.com/fizzyedit/fizzy/releases/download/sdk-v0.2.29/fizzy-sdk-v0.2.29.tar.gz",
.hash = "fizzy-0.2.29-SGBwY2sxJgCLLSPt4HLdlMSg7WtcP4K0fdtXI5WwJl2d",
.url = "https://github.com/fizzyedit/fizzy/releases/download/sdk-v0.2.30/fizzy-sdk-v0.2.30.tar.gz",
.hash = "fizzy-0.2.30-SGBwY1QnJwDznUMVnSLATxXgH2e8_Vz7eMwLj9UQ0sVU",
},
},
}
4 changes: 2 additions & 2 deletions plugin.zig.zon
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
.{
.id = "zig",
.name = "Zig",
.version = "0.2.36",
.min_sdk_version = "0.2.29",
.version = "0.2.37",
.min_sdk_version = "0.2.30",
.description = "Zig language support for fizzy",
.tags = .{ "zig", "language" },
.author = "foxnne",
Expand Down
8 changes: 4 additions & 4 deletions src/Lsp.zig
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ fn log(source: []const u8, level: std.log.Level, msg: []const u8) void {
}

fn currentEnviron() std.process.Environ {
if (builtin.os.tag == .windows) return .{ .block = .global };
if (builtin.target.os.tag == .windows) return .{ .block = .global };
return .{ .block = .{ .slice = std.mem.span(@as([*:null]?[*:0]const u8, @ptrCast(std.c.environ))) } };
}

Expand All @@ -48,7 +48,7 @@ fn tryDir(gpa: std.mem.Allocator, io: std.Io, dir: []const u8, exe_name: []const
}

fn findInPathList(gpa: std.mem.Allocator, io: std.Io, path_list: []const u8, exe_name: []const u8) ?[]const u8 {
const sep: u8 = if (builtin.os.tag == .windows) ';' else ':';
const sep: u8 = if (builtin.target.os.tag == .windows) ';' else ':';
var it = std.mem.tokenizeScalar(u8, path_list, sep);
while (it.next()) |dir| {
if (tryDir(gpa, io, dir, exe_name)) |found| return found;
Expand Down Expand Up @@ -129,7 +129,7 @@ fn resolveExecutable(
posix_name: []const u8,
windows_name: []const u8,
) []const u8 {
if (builtin.os.tag == .windows) return windows_name;
if (builtin.target.os.tag == .windows) return windows_name;

const exe_name = posix_name;

Expand All @@ -153,7 +153,7 @@ pub fn configure() void {

// Deliberately no executable resolution here — see `ensureResolved`. `register(host)` runs
// on fizzy's startup path, and everything in it is time the window doesn't appear.
command_buf[0] = if (builtin.os.tag == .windows) "zls.exe" else "zls";
command_buf[0] = if (builtin.target.os.tag == .windows) "zls.exe" else "zls";

// Reserve the key now so `ensureResolved` can fill it in by mutating the value *in place*.
// `Client.Config` stores `initialization_options` by value, and a `std.json.ObjectMap` copy
Expand Down
Loading