From ad6d7425b7a637025889207ab1a23c6be776b4b8 Mon Sep 17 00:00:00 2001 From: "Wrench[bot]" Date: Sat, 1 Jun 2024 17:25:31 -0700 Subject: [PATCH 1/2] all: update Zig to version 0.13.0-dev.351+64ef45eb0 Signed-off-by: Wrench[bot] --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0d175985..15e978bf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: - name: Setup Zig run: | sudo apt install xz-utils - sudo sh -c 'wget -c https://pkg.machengine.org/zig/zig-linux-x86_64-0.12.0-dev.3180+83e578a18.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' + sudo sh -c 'wget -c https://pkg.machengine.org/zig/zig-linux-x86_64-0.13.0-dev.351+64ef45eb0.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' - name: x86_64-linux -> aarch64-macos run: zig build -Dtarget=aarch64-macos # - name: test @@ -24,10 +24,10 @@ jobs: - name: Setup Zig run: | $ProgressPreference = 'SilentlyContinue' - Invoke-WebRequest -Uri "https://pkg.machengine.org/zig/zig-windows-x86_64-0.12.0-dev.3180+83e578a18.zip" -OutFile "C:\zig.zip" + Invoke-WebRequest -Uri "https://pkg.machengine.org/zig/zig-windows-x86_64-0.13.0-dev.351+64ef45eb0.zip" -OutFile "C:\zig.zip" cd C:\ 7z x zig.zip - Add-Content $env:GITHUB_PATH "C:\zig-windows-x86_64-0.12.0-dev.3180+83e578a18\" + Add-Content $env:GITHUB_PATH "C:\zig-windows-x86_64-0.13.0-dev.351+64ef45eb0\" # - name: test # run: zig build test x86_64-macos: @@ -38,6 +38,6 @@ jobs: - name: Setup Zig run: | brew install xz - sudo sh -c 'wget -c https://pkg.machengine.org/zig/zig-macos-x86_64-0.12.0-dev.3180+83e578a18.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' + sudo sh -c 'wget -c https://pkg.machengine.org/zig/zig-macos-x86_64-0.13.0-dev.351+64ef45eb0.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin' # - name: test # run: zig build test From cd3aa92f68324c8057ebb6421ed61cb11c559029 Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Sun, 2 Jun 2024 13:58:51 -0700 Subject: [PATCH 2/2] update to Zig 2024.05 Signed-off-by: Stephen Gutekanst --- .gitignore | 2 +- build.zig | 12 +++++++----- build.zig.zon | 12 ++++++------ 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 7bf13eb0..09ca0fc7 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,7 @@ # Cheers! # -andrewrk -zig-cache/ +.zig-cache/ zig-out/ /release/ /debug/ diff --git a/build.zig b/build.zig index f112f988..2896b3d8 100644 --- a/build.zig +++ b/build.zig @@ -6,15 +6,17 @@ pub fn build(b: *std.Build) !void { const use_system_zlib = b.option(bool, "use_system_zlib", "Use system zlib") orelse false; const enable_brotli = b.option(bool, "enable_brotli", "Build brotli") orelse true; - const freetype_module = b.addModule("mach-freetype", .{ .root_source_file = .{ .path = "src/freetype.zig" } }); + const freetype_module = b.addModule("mach-freetype", .{ + .root_source_file = b.path("src/freetype.zig"), + }); const harfbuzz_module = b.addModule("mach-harfbuzz", .{ - .root_source_file = .{ .path = "src/harfbuzz.zig" }, + .root_source_file = b.path("src/harfbuzz.zig"), .imports = &.{.{ .name = "freetype", .module = freetype_module }}, }); const freetype_tests = b.addTest(.{ .name = "freetype-tests", - .root_source_file = .{ .path = "src/freetype.zig" }, + .root_source_file = b.path("src/freetype.zig"), .target = target, .optimize = optimize, }); @@ -22,7 +24,7 @@ pub fn build(b: *std.Build) !void { const harfbuzz_tests = b.addTest(.{ .name = "harfbuzz-tests", - .root_source_file = .{ .path = "src/harfbuzz.zig" }, + .root_source_file = b.path("src/harfbuzz.zig"), .target = target, .optimize = optimize, }); @@ -64,7 +66,7 @@ pub fn build(b: *std.Build) !void { }) |example| { const example_exe = b.addExecutable(.{ .name = example, - .root_source_file = .{ .path = "examples/" ++ example ++ ".zig" }, + .root_source_file = b.path("examples/" ++ example ++ ".zig"), .target = target, .optimize = optimize, }); diff --git a/build.zig.zon b/build.zig.zon index 6a51f585..56cbe4f4 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -14,18 +14,18 @@ }, .dependencies = .{ .freetype = .{ - .url = "https://pkg.machengine.org/freetype/ad7313db50a6bd29121d587effb3b308e21a20fd.tar.gz", - .hash = "122016f743edf65f5c0569f7ad06509218688e101c66f2c094d5d9400326945bcb90", + .url = "https://pkg.machengine.org/freetype/e8c5b37f320db03acba410d993441815bc809606.tar.gz", + .hash = "1220babb7939707ca390b934657dfd3c8c3a6a78cc9442e4cbd43e3f9ffd49daec9e", .lazy = true, }, .harfbuzz = .{ - .url = "https://pkg.machengine.org/harfbuzz/ab0ce2cee88a03fb8a00aca9945ce7623f0544ed.tar.gz", - .hash = "1220d001c200dc5839f1b4302d12a699c7398498980f019671432ef9b0a1c22d85d7", + .url = "https://pkg.machengine.org/harfbuzz/cecd5c8d34d343c0ab8b4dc6d2b0e2c08da52936.tar.gz", + .hash = "1220557b115b730afbece2ff4a073b6dc095d143318ba2f6b258cee13f580dd7e8ba", .lazy = true, }, .font_assets = .{ - .url = "https://pkg.machengine.org/font-assets/7977df057e855140a207de49039114f1ab8e6c2d.tar.gz", - .hash = "12208106eef051bc730bac17c2d10f7e42ea63b579b919480fec86b7c75a620c75d4", + .url = "https://pkg.machengine.org/font-assets/899f16b815fde126ba8f6fb781e65253f461b7bf.tar.gz", + .hash = "12202b816e7c31c516bd87218fd56f9b1f93671e4ab42a2a98110d586c4b3bdd2730", .lazy = true, }, },