Skip to content

Commit 18d16b2

Browse files
committed
build: support 0.14.0
Unfortunately, this has irreconcilable incompatibilities with previous versions of zig, due to the build.zig.zon schema changes. Support for older versions has been dropped.
1 parent fd0fe77 commit 18d16b2

File tree

4 files changed

+17
-13
lines changed

4 files changed

+17
-13
lines changed

.github/workflows/ci.yaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,17 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
zig-version: ["0.13.0"]
16-
os: [ubuntu-latest, macos-latest, windows-latest]
15+
zig-version: ["0.14.0"]
16+
os: [macos-latest, windows-latest]
1717
include:
18-
- zig-version: "0.12.1"
19-
os: ubuntu-latest
20-
- zig-version: "master"
18+
- zig-version: "0.14.0"
2119
check-format: true
2220
os: ubuntu-latest
2321
build-options: "-Dbuild-apps"
22+
23+
- zig-version: "master"
24+
os: ubuntu-latest
25+
2426
runs-on: ${{ matrix.os }}
2527
steps:
2628
- name: Checkout

build.zig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ pub fn build(b: *std.Build) !void {
151151
} else {
152152
build_asm = false;
153153
}
154-
} else if (tinfo.isDarwin() and tinfo.cpu.arch == .x86_64) {
154+
} else if (tinfo.os.tag.isDarwin() and tinfo.cpu.arch == .x86_64) {
155155
libressl_common.libcrypto.addCSourceFiles(.{
156156
.root = crypto_srcroot,
157157
.files = libcrypto_macos_x86_64_asm,
@@ -338,7 +338,7 @@ pub fn build(b: *std.Build) !void {
338338
libressl_common.linkSystemLibrary("bcrypt");
339339
},
340340

341-
else => if (tinfo.isDarwin()) {
341+
else => if (tinfo.os.tag.isDarwin()) {
342342
libressl_common.libcrypto.addCSourceFiles(.{
343343
.root = crypto_srcroot,
344344
.files = libcrypto_unix_sources,

build.zig.zon

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
.{
2-
.name = "libressl",
2+
.name = .libressl,
3+
.fingerprint = 0x203FA82BE0954AFA,
34
.version = "4.0.0",
4-
.minimum_zig_version = "0.12.0",
5+
.minimum_zig_version = "0.14.0",
56
.dependencies = .{
67
.libressl = .{
78
.url = "https://github.com/libressl/portable/releases/download/v4.0.0/libressl-4.0.0.tar.gz",
8-
.hash = "1220c6577f1aa9137d3c200b804838fd71315388eec5d4c9313550143d02fe69308b",
9+
.hash = "N-V-__8AAGvDTQHGV38aqRN9PCALgEg4_XExU4juxdTJMTVQ",
910
},
1011
},
1112
.paths = .{

readme.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ your_exe.linkLibrary(libressl_dependency.artifact("tls")); // or "ssl", or "cryp
3838

3939
## Zig Version Support Matrix
4040

41-
| Refname | LibreSSL Version | Zig `0.12.x` | Zig `0.13.x` | Zig `0.14.0-dev` |
41+
| Refname | LibreSSL Version | Zig `0.12.x` | Zig `0.13.x` | Zig `0.14.x` |
4242
|-----------|------------------|--------------|--------------|------------------|
43-
| `3.9.2+1` | `3.9.2` ||||
44-
| `4.0.0+1` | `4.0.0` ||||
43+
| `3.9.2+1` | `3.9.2` ||||
44+
| `4.0.0+1` | `4.0.0` ||||
45+
| `4.0.0+2` | `4.0.0` ||||

0 commit comments

Comments
 (0)