From 2c21016ef3e95594de13e745aff1ba3e3b35e767 Mon Sep 17 00:00:00 2001 From: Bernard Assan Date: Tue, 17 Jun 2025 17:40:12 +0000 Subject: [PATCH 1/3] chore(lmdb): update to latest upstream commit fix build on master TODO: test are not running properly Signed-off-by: Bernard Assan --- build.zig | 6 +++--- build.zig.zon | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.zig b/build.zig index 1f79935..e03a5fe 100644 --- a/build.zig +++ b/build.zig @@ -64,7 +64,7 @@ const BuildLmdb = struct { .optimize = opt.optimize, .link_libc = true, .strip = opt.strip, - .sanitize_c = false, + .sanitize_c = .off, }), .use_llvm = opt.use_llvm(), .use_lld = opt.use_lld(), @@ -136,7 +136,7 @@ const BuildLmdb = struct { .optimize = opt_.optimize, .link_libc = true, .strip = opt_.strip, - .sanitize_c = false, + .sanitize_c = .off, }), .use_llvm = opt_.use_llvm(), .use_lld = opt_.use_lld(), @@ -242,7 +242,7 @@ const BuildLmdb = struct { .target = opt.target, .optimize = .Debug, .link_libc = true, - .sanitize_c = false, + .sanitize_c = .off, }), .use_lld = opt.use_lld(), }); diff --git a/build.zig.zon b/build.zig.zon index 210606a..26579b4 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -5,8 +5,8 @@ .fingerprint = 0xb2966103474360ca, .dependencies = .{ .lmdb = .{ - .url = "https://github.com/LMDB/lmdb/archive/f20e41de09d97e4461946b7e26ec831d0c24fac7.tar.gz", - .hash = "N-V-__8AAC7gCADLpFI1WXLj3t-bdozmit34FAIaqT2ijeAi", + .url = "https://github.com/LMDB/lmdb/archive/14d6629bc8a9fe40d8a6bee1bf71c45afe7576b6.tar.gz", + .hash = "N-V-__8AABzgCAC6yX-gYcngpmRFF74ZANIAhphOalO6yoyI", .lazy = false, }, }, From ee3fe80eb9da3a9ce0f2fc399792afe7b8ed2bb5 Mon Sep 17 00:00:00 2001 From: Bernard Assan Date: Wed, 18 Jun 2025 10:41:47 +0000 Subject: [PATCH 2/3] chore(version): update minimum supported zig to 0.14.1 Signed-off-by: Bernard Assan --- .github/workflows/ci.yml | 6 +++--- README.md | 2 +- build.zig | 14 ++++++++++---- build.zig.zon | 2 +- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 40da55d..b04cdd5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - zig-version: ["master", "0.14.0"] + zig-version: ["master", "0.14.1"] os: [ubuntu-latest, macos-latest, windows-latest] optimize: [ReleaseSafe, ReleaseFast] build-options: ["-Dlto"] @@ -45,7 +45,7 @@ jobs: strategy: fail-fast: false matrix: - zig-version: ["master", "0.14.0"] + zig-version: ["master", "0.14.1"] os: [ubuntu-latest] runs-on: ${{ matrix.os }} @@ -71,7 +71,7 @@ jobs: strategy: fail-fast: false matrix: - zig-version: ["master", "0.14.0"] + zig-version: ["master", "0.14.1"] os: [ubuntu-latest, macos-latest, windows-latest] runs-on: ${{ matrix.os }} diff --git a/README.md b/README.md index efa4713..7b57aad 100644 --- a/README.md +++ b/README.md @@ -46,4 +46,4 @@ Using `lmdb` artifacts and module in your project ## Supported on Linux, macOS and Windows - Zig 0.15.0-dev -- Zig 0.14.0 +- Zig 0.14.1 diff --git a/build.zig b/build.zig index e03a5fe..a27c488 100644 --- a/build.zig +++ b/build.zig @@ -14,6 +14,12 @@ const cflags = .{ "-std=c23", }; +const sanitize_c = if (builtin.zig_version.order(.{ + .major = 0, + .minor = 14, + .patch = 1, +}) == .gt) .off else false; + pub fn build(b: *Build) void { if (comptime !checkVersion()) @compileError("Update your zig toolchain to >= 0.13.0"); @@ -64,7 +70,7 @@ const BuildLmdb = struct { .optimize = opt.optimize, .link_libc = true, .strip = opt.strip, - .sanitize_c = .off, + .sanitize_c = sanitize_c, }), .use_llvm = opt.use_llvm(), .use_lld = opt.use_lld(), @@ -136,7 +142,7 @@ const BuildLmdb = struct { .optimize = opt_.optimize, .link_libc = true, .strip = opt_.strip, - .sanitize_c = .off, + .sanitize_c = sanitize_c, }), .use_llvm = opt_.use_llvm(), .use_lld = opt_.use_lld(), @@ -242,7 +248,7 @@ const BuildLmdb = struct { .target = opt.target, .optimize = .Debug, .link_libc = true, - .sanitize_c = .off, + .sanitize_c = sanitize_c, }), .use_lld = opt.use_lld(), }); @@ -327,7 +333,7 @@ fn checkVersion() bool { return false; } - const needed_version = std.SemanticVersion{ .major = 0, .minor = 14, .patch = 0 }; + const needed_version = std.SemanticVersion{ .major = 0, .minor = 14, .patch = 1 }; const version = builtin.zig_version; const order = version.order(needed_version); return order != .lt; diff --git a/build.zig.zon b/build.zig.zon index 26579b4..21e72bf 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -1,7 +1,7 @@ .{ .name = .lmdb, .version = "0.9.31+2", - .minimum_zig_version = "0.14.0", + .minimum_zig_version = "0.14.1", .fingerprint = 0xb2966103474360ca, .dependencies = .{ .lmdb = .{ From 1b53ff634b1d2be50bc5be08b856625b213de316 Mon Sep 17 00:00:00 2001 From: Bernard Assan Date: Wed, 18 Jun 2025 17:39:50 +0000 Subject: [PATCH 3/3] ci: update setup-zig use the default of enable cache also it seem I don't need to set cache-key: ${{ matrix.zig-version }} when os: field is set Signed-off-by: Bernard Assan --- .github/workflows/ci.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b04cdd5..e98c6cf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,10 +32,9 @@ jobs: submodules: false - name: Set up Zig - uses: mlugg/setup-zig@v1 + uses: mlugg/setup-zig@v2 with: version: ${{ matrix.zig-version }} - use-cache: false - name: Run `build` run: zig build ${{ matrix.build-options }} -Doptimize=${{ matrix.optimize }} --summary all @@ -57,10 +56,9 @@ jobs: submodules: false - name: Set up Zig - uses: mlugg/setup-zig@v1 + uses: mlugg/setup-zig@v2 with: version: ${{ matrix.zig-version }} - use-cache: false - name: Run `build tools on macos and windows` run: | @@ -83,10 +81,9 @@ jobs: submodules: false - name: Setup Zig - uses: mlugg/setup-zig@v1 + uses: mlugg/setup-zig@v2 with: version: ${{ matrix.zig-version }} - use-cache: false - name: Run `Test` run: zig build test --summary all