From bda6a843ca5fb5de149b6f57229f010b9565b709 Mon Sep 17 00:00:00 2001 From: Pierre Tachoire Date: Mon, 4 Dec 2023 15:27:36 +0100 Subject: [PATCH 1/6] update addCSourceFiles signature see https://github.com/ziglang/zig/pull/17420 --- build.zig | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.zig b/build.zig index 826916b6..be9cecc2 100644 --- a/build.zig +++ b/build.zig @@ -155,6 +155,9 @@ fn linkNetSurf(step: *std.build.LibExeObjStep) void { // wrapper const flags = [_][]const u8{}; const files: [1][]const u8 = .{ns ++ "wrapper/wrapper.c"}; - step.addCSourceFiles(&files, &flags); + step.addCSourceFiles(.{ + .files = &files, + .flags = &flags, + }); step.addIncludePath(.{ .path = ns ++ "wrapper" }); } From 4f86b6e519e1379e0a15c8a1cc3dca10ed190abd Mon Sep 17 00:00:00 2001 From: Pierre Tachoire Date: Mon, 4 Dec 2023 15:33:25 +0100 Subject: [PATCH 2/6] upgrade jsruntime-lib --- vendor/jsruntime-lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/jsruntime-lib b/vendor/jsruntime-lib index 254739a9..d80e4f3e 160000 --- a/vendor/jsruntime-lib +++ b/vendor/jsruntime-lib @@ -1 +1 @@ -Subproject commit 254739a97282dfe255f0b96fac7e1b854a19934f +Subproject commit d80e4f3eaf1229f3495bc7dec58c0edd0ab3cad7 From d73a204d8bef1372bcf3e0e9404f40dca9bc47c4 Mon Sep 17 00:00:00 2001 From: Pierre Tachoire Date: Mon, 4 Dec 2023 15:29:07 +0100 Subject: [PATCH 3/6] @errSetCast is now @errorCast see https://github.com/ziglang/zig/issues/17343 --- src/dom/exceptions.zig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dom/exceptions.zig b/src/dom/exceptions.zig index 48650489..b05155e7 100644 --- a/src/dom/exceptions.zig +++ b/src/dom/exceptions.zig @@ -45,7 +45,7 @@ pub const DOMException = struct { // TODO: deinit pub fn init(alloc: std.mem.Allocator, err: anyerror, callerName: []const u8) anyerror!DOMException { - const errCast = @as(parser.DOMError, @errSetCast(err)); + const errCast = @as(parser.DOMError, @errorCast(err)); const errName = DOMException.name(errCast); const str = switch (errCast) { error.HierarchyRequest => try allocPrint( From 7e7e5518d81e70ec81d2abbf8a054acf4407de17 Mon Sep 17 00:00:00 2001 From: Pierre Tachoire Date: Mon, 4 Dec 2023 15:30:08 +0100 Subject: [PATCH 4/6] revert IterableDir see https://github.com/ziglang/zig/pull/18076 --- src/wpt/run.zig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wpt/run.zig b/src/wpt/run.zig index a7c77077..26c09a19 100644 --- a/src/wpt/run.zig +++ b/src/wpt/run.zig @@ -139,7 +139,7 @@ fn evalJS(env: jsruntime.Env, alloc: std.mem.Allocator, script: []const u8, name // browse the path to find the tests list. pub fn find(allocator: std.mem.Allocator, comptime path: []const u8, list: *std.ArrayList([]const u8)) !void { - var dir = try std.fs.cwd().openIterableDir(path, .{ .no_follow = true }); + var dir = try std.fs.cwd().openDir(path, .{ .iterate = true, .no_follow = true }); defer dir.close(); var walker = try dir.walk(allocator); From 165f7a9ff3f3a5e2a6ed32c806caf4eed2b70e02 Mon Sep 17 00:00:00 2001 From: Pierre Tachoire Date: Mon, 4 Dec 2023 15:33:08 +0100 Subject: [PATCH 5/6] use const for unmutated var --- src/main.zig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.zig b/src/main.zig index e8f183b5..2dd6403c 100644 --- a/src/main.zig +++ b/src/main.zig @@ -77,7 +77,7 @@ pub fn main() !void { }; // server - var addr = try std.net.Address.initUnix(socket_path); + const addr = try std.net.Address.initUnix(socket_path); server = std.net.StreamServer.init(.{}); defer server.deinit(); try server.listen(addr); From a9100754faf758612bb0315675a67039168e2def Mon Sep 17 00:00:00 2001 From: Pierre Tachoire Date: Tue, 5 Dec 2023 14:11:53 +0100 Subject: [PATCH 6/6] ci: upgrade zig version to 0.12.0-dev.1773+8a8fd47d2 --- .github/workflows/wpt.yml | 2 +- .github/workflows/zig-fmt.yml | 2 +- .github/workflows/zig-test.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/wpt.yml b/.github/workflows/wpt.yml index 9d25847d..3e401cc4 100644 --- a/.github/workflows/wpt.yml +++ b/.github/workflows/wpt.yml @@ -40,7 +40,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/browsercore/zig-browsercore:0.11.0 + image: ghcr.io/browsercore/zig-browsercore:0.12.0-dev.1773-8a8fd47d2 credentials: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/zig-fmt.yml b/.github/workflows/zig-fmt.yml index 189e7c51..a21a831e 100644 --- a/.github/workflows/zig-fmt.yml +++ b/.github/workflows/zig-fmt.yml @@ -27,7 +27,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/browsercore/zig:0.11.0 + image: ghcr.io/browsercore/zig:0.12.0-dev.1773-8a8fd47d2 credentials: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/zig-test.yml b/.github/workflows/zig-test.yml index 45503e3f..7f6effb3 100644 --- a/.github/workflows/zig-test.yml +++ b/.github/workflows/zig-test.yml @@ -38,7 +38,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/browsercore/zig-browsercore:0.11.0 + image: ghcr.io/browsercore/zig-browsercore:0.12.0-dev.1773-8a8fd47d2 credentials: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }}