From ccd0133c15e86211663c508a9c518e30ed8d51ff Mon Sep 17 00:00:00 2001 From: Martijn Laarman Date: Wed, 9 Apr 2025 19:45:30 +0200 Subject: [PATCH] Fix clean output directory in generate command, not generateall method --- src/Elastic.Markdown/DocumentationGenerator.cs | 5 +---- src/docs-builder/Cli/Commands.cs | 5 +++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Elastic.Markdown/DocumentationGenerator.cs b/src/Elastic.Markdown/DocumentationGenerator.cs index 149512bc8..020fefd65 100644 --- a/src/Elastic.Markdown/DocumentationGenerator.cs +++ b/src/Elastic.Markdown/DocumentationGenerator.cs @@ -88,10 +88,7 @@ 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)) + if (!Context.SkipMetadata && (Context.Force || generationState == null)) DocumentationSet.ClearOutputDirectory(); if (CompilationNotNeeded(generationState, out var offendingFiles, out var outputSeenChanges)) diff --git a/src/docs-builder/Cli/Commands.cs b/src/docs-builder/Cli/Commands.cs index dfb3515cb..5893e8017 100644 --- a/src/docs-builder/Cli/Commands.cs +++ b/src/docs-builder/Cli/Commands.cs @@ -144,7 +144,12 @@ public async Task Generate( if (runningOnCi) await githubActionsService.SetOutputAsync("skip", "false"); + + // always delete output folder on CI var set = new DocumentationSet(context, logger); + if (runningOnCi) + set.ClearOutputDirectory(); + if (bool.TryParse(githubActionsService.GetInput("metadata-only"), out var metaValue) && metaValue) metadataOnly ??= metaValue;