authorgravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2025-05-28 02:17:20 -07:00
committergravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2025-05-28 02:17:20 -07:00
log71a068ac6342718a5abbd675e1adc84aeaf8f2c2
tree37a213f1e75a297e5201a1f878254a5bacf3d08a
parent78188f0f88f3602f8acdea45179354ddb582fde7

generate: use same cache path everywhere, closes #112

2 files changed, 2 insertions(+), 2 deletions(-)

deps.zig+1-1
...@@ -26,7 +26,7 @@ pub const GitExactStep = struct {...@@ -26,7 +26,7 @@ pub const GitExactStep = struct {
26 var urlpath = url;26 var urlpath = url;
27 urlpath = trimPrefix(u8, urlpath, "https://");27 urlpath = trimPrefix(u8, urlpath, "https://");
28 urlpath = trimPrefix(u8, urlpath, "git://");28 urlpath = trimPrefix(u8, urlpath, "git://");
29 const repopath = b.fmt("{s}/zigmod/deps/git/{s}/{s}", .{ b.graph.global_cache_root.path.?, urlpath, commit });29 const repopath = b.fmt("{s}/zigmod/deps/git/{s}/{s}", .{ b.cache_root.path.?, urlpath, commit });
30 flip(std.fs.cwd().access(repopath, .{})) catch return result;30 flip(std.fs.cwd().access(repopath, .{})) catch return result;
3131
32 var clonestep = std.Build.Step.Run.create(b, "clone");32 var clonestep = std.Build.Step.Run.create(b, "clone");
src/cmd/generate.zig+1-1
...@@ -67,7 +67,7 @@ pub fn create_depszig(alloc: std.mem.Allocator, cachepath: string, dir: std.fs.D...@@ -67,7 +67,7 @@ pub fn create_depszig(alloc: std.mem.Allocator, cachepath: string, dir: std.fs.D
67 \\ var urlpath = url;67 \\ var urlpath = url;
68 \\ urlpath = trimPrefix(u8, urlpath, "https://");68 \\ urlpath = trimPrefix(u8, urlpath, "https://");
69 \\ urlpath = trimPrefix(u8, urlpath, "git://");69 \\ urlpath = trimPrefix(u8, urlpath, "git://");
70 \\ const repopath = b.fmt("{s}/zigmod/deps/git/{s}/{s}", .{ b.graph.global_cache_root.path.?, urlpath, commit });70 \\ const repopath = b.fmt("{s}/zigmod/deps/git/{s}/{s}", .{ b.cache_root.path.?, urlpath, commit });
71 \\ flip(std.fs.cwd().access(repopath, .{})) catch return result;71 \\ flip(std.fs.cwd().access(repopath, .{})) catch return result;
72 \\72 \\
73 \\ var clonestep = std.Build.Step.Run.create(b, "clone");73 \\ var clonestep = std.Build.Step.Run.create(b, "clone");