zig/mach
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gpu-dawn: fix git error when fetching Dawn source

Browse source 
Previously, when the gpu-dawn SDK attempted to fetch Dawn sources, Git
failed with this error:

```
fatal: ambiguous argument 'generated-*': unknown revision or path not
in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
```

This caused the whole build to fail as the gpu-dawn SDK is unable to
check out the intended revision of the generated Dawn sources. This
commit fixes the issue by using `git checkout --force` instead of
`git reset --hard`, which works because you can checkout to a detached
commit hash (used by DirectXShaderCompiler, for example) as well as an
actual branch.

The alternative would be to do `git reset --hard origin/generated-*`
rather than `git reset --hard generated-*`, but that would require
modifying Wrench unlike this solution.
This commit is contained in:
Lue 2023-01-31 12:56:25 +00:00 • committed by Stephen Gutekanst
parent 31a54cc9c5
commit 35ae2d7ac7
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libs/gpu-dawn/sdk.zig
View file

@ -145,7 +145,7 @@ pub fn Sdk(comptime deps: anytype) type {
if (!std.mem.eql(u8, current_revision, revision)) { if (!std.mem.eql(u8, current_revision, revision)) {
// Reset to the desired revision // Reset to the desired revision
exec(allocator, &[_][]const u8{ "git", "fetch" }, dir) catch |err| std.debug.print("warning: failed to 'git fetch' in {s}: {s}\n", .{ dir, @errorName(err) }); exec(allocator, &[_][]const u8{ "git", "fetch" }, dir) catch |err| std.debug.print("warning: failed to 'git fetch' in {s}: {s}\n", .{ dir, @errorName(err) });
try exec(allocator, &[_][]const u8{ "git", "reset", "--quiet", "--hard", revision }, dir); try exec(allocator, &[_][]const u8{ "git", "checkout", "--quiet", "--force", revision }, dir);
try exec(allocator, &[_][]const u8{ "git", "submodule", "update", "--init", "--recursive" }, dir); try exec(allocator, &[_][]const u8{ "git", "submodule", "update", "--init", "--recursive" }, dir);
} }
return; return;
@ -154,7 +154,7 @@ pub fn Sdk(comptime deps: anytype) type {
std.log.info("cloning required dependency..\ngit clone {s} {s}..\n", .{ clone_url, dir }); std.log.info("cloning required dependency..\ngit clone {s} {s}..\n", .{ clone_url, dir });
try exec(allocator, &[_][]const u8{ "git", "clone", "-c", "core.longpaths=true", clone_url, dir }, sdkPath("/")); try exec(allocator, &[_][]const u8{ "git", "clone", "-c", "core.longpaths=true", clone_url, dir }, sdkPath("/"));
try exec(allocator, &[_][]const u8{ "git", "reset", "--quiet", "--hard", revision }, dir); try exec(allocator, &[_][]const u8{ "git", "checkout", "--quiet", "--force", revision }, dir);
try exec(allocator, &[_][]const u8{ "git", "submodule", "update", "--init", "--recursive" }, dir); try exec(allocator, &[_][]const u8{ "git", "submodule", "update", "--init", "--recursive" }, dir);
return; return;
}, },