From 18a2cd5bceca09346676527258fb37119bdfdbe8 Mon Sep 17 00:00:00 2001 From: Martijn Laarman Date: Tue, 8 Apr 2025 12:05:48 +0200 Subject: [PATCH 1/2] Ensure force always deletes output folder on CI regardless of generationstate --- src/Elastic.Markdown/DocumentationGenerator.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Elastic.Markdown/DocumentationGenerator.cs b/src/Elastic.Markdown/DocumentationGenerator.cs index bb61348d0..381a3ceb1 100644 --- a/src/Elastic.Markdown/DocumentationGenerator.cs +++ b/src/Elastic.Markdown/DocumentationGenerator.cs @@ -88,11 +88,11 @@ public async Task ResolveDirectoryTree(Cancel ctx) public async Task GenerateAll(Cancel ctx) { var generationState = GetPreviousGenerationState(); - if (!Context.SkipMetadata && (Context.Force || generationState == null)) + if (!string.IsNullOrEmpty(Environment.GetEnvironmentVariable("GITHUB_ACTIONS"))) DocumentationSet.ClearOutputDirectory(); - // always delete output folder on CI - else if (!string.IsNullOrEmpty(Environment.GetEnvironmentVariable("GITHUB_ACTIONS"))) + else if (!Context.SkipMetadata && (Context.Force || generationState == null)) DocumentationSet.ClearOutputDirectory(); + // always delete output folder on CI if (CompilationNotNeeded(generationState, out var offendingFiles, out var outputSeenChanges)) return; From 92447f967bc99a1cf18b4aff71c10c2fa25dd4ad Mon Sep 17 00:00:00 2001 From: Martijn Laarman Date: Tue, 8 Apr 2025 12:06:43 +0200 Subject: [PATCH 2/2] update comment --- src/Elastic.Markdown/DocumentationGenerator.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Elastic.Markdown/DocumentationGenerator.cs b/src/Elastic.Markdown/DocumentationGenerator.cs index 381a3ceb1..149512bc8 100644 --- a/src/Elastic.Markdown/DocumentationGenerator.cs +++ b/src/Elastic.Markdown/DocumentationGenerator.cs @@ -88,11 +88,11 @@ public async Task ResolveDirectoryTree(Cancel ctx) public async Task GenerateAll(Cancel ctx) { var generationState = GetPreviousGenerationState(); + // always delete output folder on CI if (!string.IsNullOrEmpty(Environment.GetEnvironmentVariable("GITHUB_ACTIONS"))) DocumentationSet.ClearOutputDirectory(); else if (!Context.SkipMetadata && (Context.Force || generationState == null)) DocumentationSet.ClearOutputDirectory(); - // always delete output folder on CI if (CompilationNotNeeded(generationState, out var offendingFiles, out var outputSeenChanges)) return;