Skip to content

Zig 0.16: walking dir requires IO #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
agagniere wants to merge 1 commit into from
Closed

Zig 0.16: walking dir requires IO #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 1 addition & 4 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,9 @@ jobs:
strategy:
fail-fast: false
matrix:
zig-version: ["0.14.1"]
zig-version: ["master"]
os: [macos-latest, windows-latest]
include:
- zig-version: "0.14.1"
os: ubuntu-latest

- zig-version: "master"
check-format: true
build-options: "-Dbuild-apps"
Expand Down
8 changes: 4 additions & 4 deletions build.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,11 +567,12 @@ const LibreSslCommon = struct {
base: []const u8,
skiplist: []const SkipSpec,
) !void {
const dir = try upstream.builder.build_root.handle.openDir(base, .{ .iterate = true });
const dir = try upstream.builder.build_root.handle.openDir(b.graph.io, base, .{ .iterate = true });
defer dir.close(b.graph.io);
var walker = try dir.walk(b.allocator);
defer walker.deinit();

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

if (std.mem.endsWith(u8, child.basename, ".h")) {
const full = b.pathJoin(&.{ base, child.path });
self.installHeader(upstream.path(full), child.path);
self.installHeader(upstream.path(base).path(b, child.path), child.path);
Comment on lines -583 to +584
Copy link
Contributor

@torque torque Jan 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't really have a problem with this change, but is there a specific reason for it? IIRC pathJoin was used because 0.14 or possibly an older version was missing the path method on one of the intermediates. Since this change breaks all backward compatibility anyway, that doesn't apply any more, but I'm curious if you know if there is an actual practical difference between the two implementations?

Copy link
Member Author

@agagniere agagniere Jan 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There was no good reason for me to change this, it was the result of some back and forth, and I kept it because it looked simpler / more obvious to me, however I have no string opinion about it.

I checked the std docs and LazyPath.path was introduced in 0.13 (missing in 0.12), so either way is fine for 0.14

}
}
}
Expand Down
6 changes: 2 additions & 4 deletions readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@ your_exe.linkLibrary(libressl_dependency.artifact("tls")); // or "ssl", or "cryp

| Refname | LibreSSL Version | Zig `0.16.0-dev` | Zig `0.15.x` | Zig `0.14.x` | Zig `0.13.x` | Zig `0.12.x` |
|-----------|------------------|------------------|--------------|--------------|--------------|--------------|
| `4.0.0+4` | `4.0.0` | ✅ | ✅ | ✅ | ❌ | ❌ |
| `4.0.0+3` | `4.0.0` | ❌ | ✅ | ✅ | ❌ | ❌ |
| `4.0.0+2` | `4.0.0` | ❌ | ❌ | ✅ | ❌ | ❌ |
| `4.0.0+5` | `4.0.0` | ✅ | ❌ | ❌ | ❌ | ❌ |
| `4.0.0+4` | `4.0.0` | ❌ | ✅ | ✅ | ❌ | ❌ |
| `4.0.0+1` | `4.0.0` | ❌ | ❌ | ❌ | ✅ | ✅ |
| `3.9.2+1` | `3.9.2` | ❌ | ❌ | ❌ | ✅ | ✅ |