Skip to content

Commit eb0ef69

Browse files
authored
Merge pull request #5 from der-teufel-programming/master-update
Update zfat dep; Update build system API
2 parents 0488182 + 6dbdf63 commit eb0ef69

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

.github/workflows/validate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Setup Zig
1717
uses: mlugg/setup-zig@v1
1818
with:
19-
version: 0.13.0
19+
version: 0.14.0-dev.3020+c104e8644
2020

2121
- name: Basic Build
2222
run: |

build.zig

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ pub fn build(b: *std.Build) void {
129129

130130
const mkfs_fat = b.addExecutable(.{
131131
.name = "mkfs.fat",
132-
.target = b.host,
132+
.target = b.graph.host,
133133
.optimize = .ReleaseSafe,
134134
.root_source_file = b.path("src/mkfs.fat.zig"),
135135
});
@@ -524,9 +524,9 @@ pub const InitializeDiskStep = struct {
524524
}
525525
}
526526

527-
fn make(step: *std.Build.Step, progress: std.Progress.Node) !void {
527+
fn make(step: *std.Build.Step, options: std.Build.Step.MakeOptions) !void {
528528
const b = step.owner;
529-
_ = progress;
529+
_ = options;
530530

531531
const ids: *InitializeDiskStep = @fieldParentPtr("step", step);
532532

@@ -629,7 +629,7 @@ pub const Content = union(enum) {
629629
dir.* = try allocator.dupe(u8, dir.*);
630630
},
631631
.copy_dir, .copy_file => |*cp| {
632-
const cp_new = .{
632+
const cp_new: FileSystem.Copy = .{
633633
.destination = try allocator.dupe(u8, cp.destination),
634634
.source = cp.source.dupe(b),
635635
};

build.zig.zon

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
.version = "0.1.0",
44
.dependencies = .{
55
.zfat = .{
6-
.url = "https://github.com/ZigEmbeddedGroup/zfat/archive/68dbbe19258b174fe4f374a91b4cc939019d9fe7.tar.gz",
7-
.hash = "1220963601b9bc8dacc422d098368567e5c7b84d21f9ae73067fe3eb9c566aea02fd",
6+
.url = "https://github.com/ZigEmbeddedGroup/zfat/archive/3ce06d43a4e04d387034dcae2f486b050701f321.tar.gz",
7+
.hash = "12205d874e8c9fd08d93c09ccbfddb045809afcc28e232b36b5abe3d288278ce458f",
88
},
99
},
1010
.paths = .{

0 commit comments

Comments
 (0)