Skip to content

Commit 0a78678

Browse files
committed
Zig 0.16: walking dir requires IO
1 parent 674679d commit 0a78678

3 files changed

Lines changed: 8 additions & 11 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,11 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
zig-version: ["0.14.1"]
16-
os: [macos-latest, windows-latest]
15+
zig-version: ["0.15.2"]
16+
os: [macos-latest, windows-latest, ubuntu-latest]
1717
include:
1818
- zig-version: "0.14.1"
1919
os: ubuntu-latest
20-
2120
- zig-version: "master"
2221
check-format: true
2322
build-options: "-Dbuild-apps"

build.zig

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -567,11 +567,12 @@ const LibreSslCommon = struct {
567567
base: []const u8,
568568
skiplist: []const SkipSpec,
569569
) !void {
570-
const dir = try upstream.builder.build_root.handle.openDir(base, .{ .iterate = true });
570+
const dir = try upstream.builder.build_root.handle.openDir(b.graph.io, base, .{ .iterate = true });
571+
defer dir.close(b.graph.io);
571572
var walker = try dir.walk(b.allocator);
572573
defer walker.deinit();
573574

574-
walker: while (try walker.next()) |child| {
575+
walker: while (try walker.next(b.graph.io)) |child| {
575576
for (skiplist) |entry| {
576577
switch (entry) {
577578
.starts_with => |name| if (std.mem.startsWith(u8, child.path, name)) continue :walker,
@@ -580,8 +581,7 @@ const LibreSslCommon = struct {
580581
}
581582

582583
if (std.mem.endsWith(u8, child.basename, ".h")) {
583-
const full = b.pathJoin(&.{ base, child.path });
584-
self.installHeader(upstream.path(full), child.path);
584+
self.installHeader(upstream.path(base).path(b, child.path), child.path);
585585
}
586586
}
587587
}

readme.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ your_exe.linkLibrary(libressl_dependency.artifact("tls")); // or "ssl", or "cryp
4848

4949
| Refname | LibreSSL Version | Zig `0.16.0-dev` | Zig `0.15.x` | Zig `0.14.x` | Zig `0.13.x` | Zig `0.12.x` |
5050
|-----------|------------------|------------------|--------------|--------------|--------------|--------------|
51-
| `4.0.0+4` | `4.0.0` ||||||
52-
| `4.0.0+3` | `4.0.0` ||||||
53-
| `4.0.0+2` | `4.0.0` ||||||
51+
| `4.0.0+5` | `4.0.0` ||||||
52+
| `4.0.0+4` | `4.0.0` ||||||
5453
| `4.0.0+1` | `4.0.0` ||||||
55-
| `3.9.2+1` | `3.9.2` ||||||

0 commit comments

Comments
 (0)