Skip to content

Commit

Permalink
updated editorconfig and format settings (#1285)
Browse files Browse the repository at this point in the history
  • Loading branch information
david-driscoll authored Nov 29, 2023
1 parent 59e532f commit ea76e0e
Show file tree
Hide file tree
Showing 18 changed files with 4,924 additions and 775 deletions.
21 changes: 18 additions & 3 deletions .build/Build.CI.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,18 @@
ExcludedTargets = new[] { nameof(ICanClean.Clean), nameof(ICanRestoreWithDotNetCore.DotnetToolRestore) },
Enhancements = new[] { nameof(CiMiddleware) }
)]
[GitHubActionsLint(
"lint",
GitHubActionsImage.UbuntuLatest,
AutoGenerate = false,
OnPullRequestTargetBranches = new[] { "master", "main", "next" },
Enhancements = new[] { nameof(LintStagedMiddleware) }
)]
[PrintBuildVersion]
[PrintCIEnvironment]
[UploadLogs]
[TitleEvents]
[ContinuousIntegrationConventions]
[LocalBuildConventions]
public partial class Pipeline
{
public static RocketSurgeonGitHubActionsConfiguration CiIgnoreMiddleware(RocketSurgeonGitHubActionsConfiguration configuration)
Expand All @@ -70,8 +76,17 @@ public static RocketSurgeonGitHubActionsConfiguration CiMiddleware(RocketSurgeon
.AddNuGetCache()
// .ConfigureForGitVersion()
.ConfigureStep<CheckoutStep>(step => step.FetchDepth = 0)
.PublishLogs<Pipeline>()
.FailFast = false;
.PublishLogs<Pipeline>();

return configuration;
}

public static RocketSurgeonGitHubActionsConfiguration LintStagedMiddleware(RocketSurgeonGitHubActionsConfiguration configuration)
{
configuration
.Jobs.OfType<RocketSurgeonsGithubActionsJob>()
.First(z => z.Name.Equals("Build", StringComparison.OrdinalIgnoreCase))
.UseDotNetSdks("6.0", "8.0");

return configuration;
}
Expand Down
12 changes: 6 additions & 6 deletions .build/Build.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,22 @@
[MSBuildVerbosityMapping]
[NuGetVerbosityMapping]
[ShutdownDotNetAfterServerBuild]
[LocalBuildConventions]
public partial class Pipeline : NukeBuild,
ICanRestoreWithDotNetCore,
ICanBuildWithDotNetCore,
ICanTestWithDotNetCore,
ICanPackWithDotNetCore,
IHaveDataCollector,
ICanClean,
ICanLintStagedFiles,
ICanDotNetFormat,
ICanPrettier,
ICanUpdateReadme,
IGenerateCodeCoverageReport,
IGenerateCodeCoverageSummary,
IGenerateCodeCoverageBadges,
ICanRegenerateBuildConfiguration,
IHaveConfiguration<Configuration>,
IGenerateDocFx
{
Expand All @@ -49,7 +54,6 @@ public static int Main()
}

private Target Default => _ => _
// ReSharper restore AllUnderscoreLocalParameterName
.DependsOn(Restore)
.DependsOn(Build)
.DependsOn(Test)
Expand All @@ -62,15 +66,11 @@ public static int Main()
.DependsOn(Clean);

public Target Clean => _ => _.Inherit<ICanClean>(x => x.Clean);
public Target Lint => _ => _.Inherit<ICanLint>(x => x.Lint);
public Target Restore => _ => _.Inherit<ICanRestoreWithDotNetCore>(x => x.CoreRestore);
public Target Test => _ => _.Inherit<ICanTestWithDotNetCore>(x => x.CoreTest);
public Target Docs => _ => _.Inherit<IGenerateDocFx>(x => x.CoreDocs);

public Target BuildVersion => _ => _.Inherit<IHaveBuildVersion>(x => x.BuildVersion)
.Before(Default)
.Before(Clean);


[Solution(GenerateProjects = true)] private Solution Solution { get; } = null!;
Nuke.Common.ProjectModel.Solution IHaveSolution.Solution => Solution;

Expand Down
4 changes: 0 additions & 4 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@
"version": "2023.2.3",
"commands": ["jb"]
},
"dotnet-format": {
"version": "5.1.250801",
"commands": ["dotnet-format"]
},
"nukeeper": {
"version": "0.35.0",
"commands": ["nukeeper"]
Expand Down
Loading

0 comments on commit ea76e0e

Please sign in to comment.