Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

husky has changed the value of core.hookspath slightly, adding suppor… #1149

Merged
merged 1 commit into from
Mar 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
"which": "^4.0.0"
},
"scripts": {
"husky": "husky"
"prepare": "husky"
}
}
46 changes: 27 additions & 19 deletions src/Nuke/EnsureGitHooksAttribute.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,12 @@ public EnsureGitHooksAttribute(params GitHook[] hookNames)
{
HookNames = hookNames
.Select(
x => x.ToString().Humanize().Replace(" ", "_", StringComparison.Ordinal).Dasherize()
.ToLowerInvariant()
x => x
.ToString()
.Humanize()
.Replace(" ", "_", StringComparison.Ordinal)
.Dasherize()
.ToLowerInvariant()
)
.ToArray();
}
Expand Down Expand Up @@ -58,12 +62,13 @@ public void OnBuildCreated(IReadOnlyCollection<ExecutableTarget> executableTarge
/// <inheritdoc />
public void OnBuildInitialized(IReadOnlyCollection<ExecutableTarget> executableTargets, IReadOnlyCollection<ExecutableTarget> executionPlan)
{
if ((NukeBuild.RootDirectory / "package.json").FileExists() && !NukeBuild.RootDirectory.ContainsDirectory("node_modules"))
if (( NukeBuild.RootDirectory / "package.json" ).FileExists() && !NukeBuild.RootDirectory.ContainsDirectory("node_modules"))
{
Log.Information("package.json found running npm install to see if that installs any hooks");
ProcessTasks.StartProcess(ToolPathResolver.GetPathExecutable("npm"), NukeBuild.IsLocalBuild ? "install" : "ci", workingDirectory: NukeBuild.RootDirectory)
.AssertWaitForExit()
.AssertZeroExitCode();
ProcessTasks
.StartProcess(ToolPathResolver.GetPathExecutable("npm"), NukeBuild.IsLocalBuild ? "install" : "ci", NukeBuild.RootDirectory)
.AssertWaitForExit()
.AssertZeroExitCode();
}
}

Expand All @@ -77,28 +82,30 @@ public bool AreHooksInstalled(IReadOnlyCollection<string> hooks)
var hooksOutput = GitTasks.Git($"config --get core.hookspath", logOutput: false, logInvocation: false);
var hooksPath = hooksOutput.StdToText().Trim();
var huskyScriptPath = NukeBuild.RootDirectory / ".husky" / "_" / "husky.sh";
return hooksPath == ".husky" && huskyScriptPath.FileExists();
return hooksPath.StartsWith(".husky") && huskyScriptPath.FileExists();
}
#pragma warning disable CA1031
#pragma warning disable CA1031
catch
#pragma warning restore CA1031
#pragma warning restore CA1031
{
return false;
}
}

public void InstallHooks(IReadOnlyCollection<string> hooks)
{
if ((NukeBuild.RootDirectory / "package.json").FileExists())
if (( NukeBuild.RootDirectory / "package.json" ).FileExists())
{
Log.Information("package.json found running npm install to see if that installs any hooks");
ProcessTasks.StartProcess(ToolPathResolver.GetPathExecutable("npm"), "install", workingDirectory: NukeBuild.RootDirectory)
.AssertWaitForExit()
.AssertZeroExitCode();
ProcessTasks
.StartProcess(ToolPathResolver.GetPathExecutable("npm"), "install", NukeBuild.RootDirectory)
.AssertWaitForExit()
.AssertZeroExitCode();
if (NukeBuild.IsLocalBuild)
{
ProcessTasks.StartProcess(ToolPathResolver.GetPathExecutable("npm"), "run husky", workingDirectory: NukeBuild.RootDirectory)
.AssertWaitForExit();
ProcessTasks
.StartProcess(ToolPathResolver.GetPathExecutable("npm"), "run husky", NukeBuild.RootDirectory)
.AssertWaitForExit();
}
}

Expand All @@ -107,10 +114,11 @@ public void InstallHooks(IReadOnlyCollection<string> hooks)
Log.Information(
"package.json not found or prepare script did not work correctly running npx husky"
);
ProcessTasks.StartProcess(ToolPathResolver.GetPathExecutable("npx"), "husky", workingDirectory: NukeBuild.RootDirectory)
.AssertWaitForExit()
.AssertZeroExitCode();
ProcessTasks
.StartProcess(ToolPathResolver.GetPathExecutable("npx"), "husky", NukeBuild.RootDirectory)
.AssertWaitForExit()
.AssertZeroExitCode();
}
}
}
}
}