From 163ba497a8fba174962f9161531c7f8f550b36bc Mon Sep 17 00:00:00 2001 From: Meghan Denny Date: Wed, 2 Feb 2022 03:02:44 -0800 Subject: [PATCH] update to zig master 0.10.0-dev.466+e288148f6 --- .circleci/config.yml | 2 +- .github/workflows/nightly.yml | 2 +- README.md | 2 +- deps.zig | 2 +- docs/README.md | 2 +- src/cmd/aquila/add.zig | 2 +- src/cmd/init.zig | 4 ++-- src/cmd/zpm/add.zig | 2 +- zig.mod | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f504e9d708bff84fe934b969fc89a16fe9602685..0c26419b140feb7066b37029b8f99d6ad8a4eb0d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,7 +15,7 @@ jobs: - run: git submodule update --init --recursive - run: apt -y install xz-utils jq - - run: ./download_zig.sh 0.10.0-dev.397+f1b79c9a4 + - run: ./download_zig.sh 0.10.0-dev.466+e288148f6 - run: zig version - run: zig env - run: zig build -Dbootstrap diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 8f5c07fa4bd76632df32a5551f38148a26300dc7..2a1c431373296dd578ea9a24076bfdca6f313e5b 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -28,7 +28,7 @@ jobs: - name: Setup Zig uses: goto-bus-stop/setup-zig@v1 with: - version: "0.10.0-dev.397+f1b79c9a4" + version: "0.10.0-dev.466+e288148f6" - run: zig version - run: zig env diff --git a/README.md b/README.md index cae510730696c40d869806b2174f607aff957f9a..1015e4ab81afdd0274f4a595f3c303ec9e30a582 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ A package manager for the Zig programming language. - https://github.com/nektro/zigmod/releases ## Built With -- Zig master (at least `0.10.0-dev.397+f1b79c9a4`) +- Zig master (at least `0.10.0-dev.466+e288148f6`) - See [`zig.mod`](./zig.mod) and [`zigmod.lock`](./zigmod.lock) ### Build from Source diff --git a/deps.zig b/deps.zig index 68f82737f3eb827337eced725614419cc100ad13..02042d8710a915a8bcb2f4bfb76b2f2a011ced97 100644 --- a/deps.zig +++ b/deps.zig @@ -44,7 +44,7 @@ pub const Package = struct { }; fn checkMinZig(current: std.SemanticVersion, exe: *std.build.LibExeObjStep) void { - const min = std.SemanticVersion.parse("0.10.0-dev.397+f1b79c9a4") catch return; + const min = std.SemanticVersion.parse("0.10.0-dev.466+e288148f6") catch return; if (current.order(min).compare(.lt)) @panic(exe.builder.fmt("Your Zig version v{} does not meet the minimum build requirement of v{}", .{current, min})); } diff --git a/docs/README.md b/docs/README.md index 91d810cc827a2c32007cafebb67672ac593ab675..5fb6eb85f96f6074bea7f7a0ff635d280ec8e880 100644 --- a/docs/README.md +++ b/docs/README.md @@ -10,7 +10,7 @@ The rest of this documentation will assume you already have Zig installed. As Zig is still in development itself, if you plan to contribute to Zigmod you will need a master download of Zig. Those can be obtained from https://ziglang.org/download/#release-master. -The earliest Zig release this Zigmod was verified to work with is `0.10.0-dev.397+f1b79c9a4`. +The earliest Zig release this Zigmod was verified to work with is `0.10.0-dev.466+e288148f6`. ## Download You may download a precompiled binary from https://github.com/nektro/zigmod/releases or build the project from source. diff --git a/src/cmd/aquila/add.zig b/src/cmd/aquila/add.zig index 6ee88102b234d7c0ea90cb0915fd1e38c1e5d856..fcb1ad7fce5b95a8c5c07e1856711df77cb77153 100644 --- a/src/cmd/aquila/add.zig +++ b/src/cmd/aquila/add.zig @@ -36,7 +36,7 @@ pub fn do(dir: std.fs.Dir, pkg_id: string) !string { } } - const file = dir.openFile("zig.mod", .{ .read = true, .write = true }) catch |err| switch (err) { + const file = dir.openFile("zig.mod", .{ .mode = .read_write }) catch |err| switch (err) { error.FileNotFound => u.fail("error: zig.mod manifest not found! must run from project root.", .{}), else => return err, }; diff --git a/src/cmd/init.zig b/src/cmd/init.zig index 6a2aa0fcc113341f0637d33c1574ecccae9e1f5c..430edb6699ccf8fe7a639459601817a743fd23dd 100644 --- a/src/cmd/init.zig +++ b/src/cmd/init.zig @@ -137,7 +137,7 @@ pub fn execute(args: [][]u8) !void { const do = try inquirer.forConfirm(stdout, stdin, "It appears you're using git. Do you want init to add Zigmod to your .gitignore?", gpa); if (do) { const exists = try u.does_file_exist(null, ".gitignore"); - const file: std.fs.File = try (if (exists) cwd.openFile(".gitignore", .{ .read = true, .write = true }) else cwd.createFile(".gitignore", .{})); + const file: std.fs.File = try (if (exists) cwd.openFile(".gitignore", .{ .mode = .read_write }) else cwd.createFile(".gitignore", .{})); defer file.close(); const len = try file.getEndPos(); if (len > 0) try file.seekTo(len - 1); @@ -156,7 +156,7 @@ pub fn execute(args: [][]u8) !void { const do = try inquirer.forConfirm(stdout, stdin, "It appears you're using git. Do you want init to add Zigmod to your .gitattributes?", gpa); if (do) { const exists = try u.does_file_exist(null, ".gitattributes"); - const file: std.fs.File = try (if (exists) cwd.openFile(".gitattributes", .{ .read = true, .write = true }) else cwd.createFile(".gitattributes", .{})); + const file: std.fs.File = try (if (exists) cwd.openFile(".gitattributes", .{ .mode = .read_write }) else cwd.createFile(".gitattributes", .{})); defer file.close(); const len = try file.getEndPos(); if (len > 0) try file.seekTo(len - 1); diff --git a/src/cmd/zpm/add.zig b/src/cmd/zpm/add.zig index b8f12f476198964a793c2e75897d0ec881da8909..ee36f6e64d1c14497bcfafb4d62b148cfa4bf779 100644 --- a/src/cmd/zpm/add.zig +++ b/src/cmd/zpm/add.zig @@ -58,7 +58,7 @@ pub fn execute(args: [][]u8) !void { break :blk _req.status.code == 200; }; - const file = try std.fs.cwd().openFile("zig.mod", .{ .read = true, .write = true }); + const file = try std.fs.cwd().openFile("zig.mod", .{ .mode = .read_write }); try file.seekTo(try file.getEndPos()); const file_w = file.writer(); diff --git a/zig.mod b/zig.mod index e68d0cf3711c4aec25b028a8224c14a73b57b928..eff38affa389b61a881043ee4e8dc7b8e538b71c 100644 --- a/zig.mod +++ b/zig.mod @@ -3,7 +3,7 @@ name: zigmod main: src/lib.zig license: MIT description: A package manager for the Zig programming language. -min_zig_version: 0.10.0-dev.397+f1b79c9a4 +min_zig_version: 0.10.0-dev.466+e288148f6 dependencies: - src: git https://github.com/yaml/libyaml tag-0.2.5 id: 8mdbh0zuneb0i3hs5jby5je0heem1i6yxusl7c8y8qx68hqc -- 2.54.0