ProjectHasChanged Check (#347)

* ProjectHasChanged Check * Formatting Markdown * Invert condition * Remove delay * Tweaks * Formatting Markdown * Pack all projects if on main * Revert * Debug * Better throwing * Remove stacktrace hidden * ReleaseNotes.md * Formatting Markdown --------- Co-authored-by: Tom Longhurst <[email protected]>
thomhurst · Dec 26, 2023 · 6cb6216 · 6cb6216
1 parent 5011d4b
commit 6cb6216
Show file tree

Hide file tree

Showing 11 changed files with 58 additions and 5 deletions.
diff --git a/.github/workflows/dotnet-mac.yml b/.github/workflows/dotnet-mac.yml
@@ -55,6 +55,7 @@ jobs:
           GitHub__PullRequest__Number: ${{ github.event.number }}
           GitHub__PullRequest__Branch: ${{ github.event.pull_request.head.ref }}
           GitHub__PullRequest__Author: ${{ github.event.pull_request.user.login }}
+          GitHub__StandardToken: ${{ secrets.DOTNET_FORMAT_PUSH_TOKEN }}
           Publish__ShouldPublish: false
           EMAIL_PASSWORD: ${{ secrets.EMAIL_PASSWORD }}
       - name: Upload Code Coverage Results

diff --git a/.github/workflows/dotnet-windows.yml b/.github/workflows/dotnet-windows.yml
@@ -57,6 +57,7 @@ jobs:
           GitHub__PullRequest__Number: ${{ github.event.number }}
           GitHub__PullRequest__Branch: ${{ github.event.pull_request.head.ref }}
           GitHub__PullRequest__Author: ${{ github.event.pull_request.user.login }}
+          GitHub__StandardToken: ${{ secrets.DOTNET_FORMAT_PUSH_TOKEN }}
           Publish__ShouldPublish: false
           EMAIL_PASSWORD: ${{ secrets.EMAIL_PASSWORD }}
       - name: Upload Code Coverage Results

diff --git a/src/ModularPipelines.Build/Modules/CodeFormattedNicelyModule.cs b/src/ModularPipelines.Build/Modules/CodeFormattedNicelyModule.cs
@@ -1,4 +1,5 @@
 using Microsoft.Extensions.Options;
+using ModularPipelines.Attributes;
 using ModularPipelines.Build.Attributes;
 using ModularPipelines.Build.Settings;
 using ModularPipelines.Context;
@@ -13,6 +14,7 @@ namespace ModularPipelines.Build.Modules;
 
 [SkipIfDependabot]
 [SkipOnMainBranch]
+[RunOnLinuxOnly]
 public class CodeFormattedNicelyModule : Module<CommandResult>
 {
     public override ModuleRunType ModuleRunType => ModuleRunType.AlwaysRun;

diff --git a/src/ModularPipelines.Build/Modules/FormatMarkdownModule.cs b/src/ModularPipelines.Build/Modules/FormatMarkdownModule.cs
@@ -13,6 +13,7 @@
 namespace ModularPipelines.Build.Modules;
 
 [SkipIfDependabot]
+[RunOnLinuxOnly]
 [DependsOn<GenerateReadMeModule>]
 public class FormatMarkdownModule : Module<CommandResult>
 {

diff --git a/src/ModularPipelines.Build/Modules/PackProjectsModule.cs b/src/ModularPipelines.Build/Modules/PackProjectsModule.cs
@@ -1,8 +1,10 @@
 using EnumerableAsyncProcessor.Extensions;
+using Microsoft.Extensions.Logging;
 using ModularPipelines.Attributes;
 using ModularPipelines.Context;
 using ModularPipelines.DotNet.Extensions;
 using ModularPipelines.DotNet.Options;
+using ModularPipelines.Git.Extensions;
 using ModularPipelines.Models;
 using ModularPipelines.Modules;
 using File = ModularPipelines.FileSystem.File;
@@ -13,6 +15,8 @@ namespace ModularPipelines.Build.Modules;
 [DependsOn<PackageFilesRemovalModule>]
 [DependsOn<CodeFormattedNicelyModule>]
 [DependsOn<FindProjectDependenciesModule>]
+
+[DependsOn<GetChangedFilesInPullRequest>]
 [RunOnLinuxOnly]
 public class PackProjectsModule : Module<CommandResult[]>
 {
@@ -23,19 +27,49 @@ public class PackProjectsModule : Module<CommandResult[]>
 
         var projectFiles = await GetModule<FindProjectDependenciesModule>();
 
+        var changesFiles = await GetModule<GetChangedFilesInPullRequest>();
+
         var dependencies = await projectFiles.Value!.Dependencies
             .ToAsyncProcessorBuilder()
             .SelectAsync(async projectFile => await Pack(context, cancellationToken, projectFile, packageVersion))
             .ProcessOneAtATime();
 
+        var gitVersioningInformation = await context.Git().Versioning.GetGitVersioningInformation();
+
         var others = await projectFiles.Value!.Others
+            .Where(x =>
+            {
+                if (gitVersioningInformation.BranchName == "main")
+                {
+                    return true;
+                }
+
+                return ProjectHasChanged(x,
+                    changesFiles.Value?.Select(x => new File(x.FileName)).ToList() ?? new List<File>(), context);
+            })
             .ToAsyncProcessorBuilder()
             .SelectAsync(async projectFile => await Pack(context, cancellationToken, projectFile, packageVersion))
             .ProcessInParallel();
 
         return dependencies.Concat(others).ToArray();
     }
 
+    private bool ProjectHasChanged(File projectFile, IEnumerable<File> changedFiles,
+        IPipelineContext context)
+    {
+        var projectDirectory = projectFile.Folder!;
+
+        if (!changedFiles.Any(x => x.Path.Contains(projectDirectory.Path)))
+        {
+            context.Logger.LogInformation("{Project} has not changed so not packing it", projectFile.Name);
+            return false;
+        }
+
+        context.Logger.LogInformation("{Project} has changed so packing it", projectFile.Name);
+
+        return true;
+    }
+
     private static async Task<CommandResult> Pack(IPipelineContext context, CancellationToken cancellationToken, File projectFile, ModuleResult<string> packageVersion)
     {
         return await context.DotNet().Pack(new DotNetPackOptions

diff --git a/src/ModularPipelines.Build/Modules/UploadPackagesToNugetModule.cs b/src/ModularPipelines.Build/Modules/UploadPackagesToNugetModule.cs
@@ -18,6 +18,7 @@ namespace ModularPipelines.Build.Modules;
 [RunOnLinuxOnly]
 [SkipIfDependabot]
 [RunOnlyOnBranch("main")]
+[RunOnLinuxOnly]
 public class UploadPackagesToNugetModule : Module<CommandResult[]>
 {
     private readonly IOptions<NuGetSettings> _nugetSettings;

diff --git a/src/ModularPipelines.Build/Program.cs b/src/ModularPipelines.Build/Program.cs
@@ -1,6 +1,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using ModularPipelines.Build;
 using ModularPipelines.Build.Modules;
@@ -66,4 +67,5 @@ await PipelineHostBuilder.Create()
         }
     })
     .ConfigurePipelineOptions((context, options) => options.DefaultRetryCount = 3)
+    .SetLogLevel(LogLevel.Debug)
     .ExecutePipelineAsync();
diff --git a/src/ModularPipelines.Build/ReleaseNotes.md b/src/ModularPipelines.Build/ReleaseNotes.md
@@ -1,2 +1,3 @@
 *   Rework execution engine to not use nested delegates
--   Fix a bug where skipped modules could still start
+*   Fix a bug where skipped modules could still start
+*
diff --git a/src/ModularPipelines/Engine/Executors/ModuleHandlers/ErrorHandler.cs b/src/ModularPipelines/Engine/Executors/ModuleHandlers/ErrorHandler.cs
@@ -71,7 +71,6 @@ private async Task SaveFailedResult(Exception exception)
         await Module.HistoryHandler.SaveResult(moduleResult);
     }
 
-    [StackTraceHidden]
     private void CancelPipelineAndThrow(Exception exception)
     {
         Context.Logger.LogDebug("Module failed. Cancelling the pipeline");

diff --git a/src/ModularPipelines/Engine/Executors/ModuleHandlers/HookHandler.cs b/src/ModularPipelines/Engine/Executors/ModuleHandlers/HookHandler.cs
@@ -19,6 +19,7 @@ public async Task OnBeforeExecute(IPipelineContext context)
         catch (Exception exception)
         {
             Logger.LogError(exception, "Error in OnBeforeExecute");
+            throw;
         }
     }
 
@@ -31,6 +32,7 @@ public async Task OnAfterExecute(IPipelineContext context)
         catch (Exception exception)
         {
             Logger.LogError(exception, "Error in OnAfterExecute");
+            throw;
         }
     }
 }
diff --git a/src/ModularPipelines/Engine/Executors/PipelineExecutor.cs b/src/ModularPipelines/Engine/Executors/PipelineExecutor.cs
@@ -30,6 +30,7 @@ public async Task<PipelineSummary> ExecuteAsync(List<ModuleBase> runnableModules
         var start = DateTimeOffset.UtcNow;
         var stopWatch = Stopwatch.StartNew();
 
+        Exception? exception;
         PipelineSummary pipelineSummary;
         try
         {
@@ -45,7 +46,7 @@ public async Task<PipelineSummary> ExecuteAsync(List<ModuleBase> runnableModules
         }
         finally
         {
-            await WaitForAlwaysRunModules(runnableModules);
+            exception = await WaitForAlwaysRunModules(runnableModules);
 
             var end = DateTimeOffset.UtcNow;
 
@@ -54,18 +55,26 @@ public async Task<PipelineSummary> ExecuteAsync(List<ModuleBase> runnableModules
             await _pipelineSetupExecutor.OnEndAsync(pipelineSummary);
         }
 
+        if (exception != null)
+        {
+            throw exception;
+        }
+
         return pipelineSummary;
     }
 
-    private async Task WaitForAlwaysRunModules(IEnumerable<ModuleBase> runnableModules)
+    private async Task<Exception?> WaitForAlwaysRunModules(IEnumerable<ModuleBase> runnableModules)
     {
         try
         {
             await Task.WhenAll(runnableModules.Where(m => m.ModuleRunType == ModuleRunType.AlwaysRun).Select(m => m.ExecutionTask));
         }
-        catch (Exception e)
+        catch (Exception? e)
         {
             _logger.LogWarning(e, "Error while waiting for Always Run modules");
+            return e;
         }
+
+        return null;
     }
 }