Skip to content

Commit 37f7505

Browse files
authored
Fix clean output directory in generate command, not generateall method (#1071)
1 parent bc7602f commit 37f7505

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/Elastic.Markdown/DocumentationGenerator.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,7 @@ public async Task ResolveDirectoryTree(Cancel ctx)
8888
public async Task GenerateAll(Cancel ctx)
8989
{
9090
var generationState = GetPreviousGenerationState();
91-
// always delete output folder on CI
92-
if (!string.IsNullOrEmpty(Environment.GetEnvironmentVariable("GITHUB_ACTIONS")))
93-
DocumentationSet.ClearOutputDirectory();
94-
else if (!Context.SkipMetadata && (Context.Force || generationState == null))
91+
if (!Context.SkipMetadata && (Context.Force || generationState == null))
9592
DocumentationSet.ClearOutputDirectory();
9693

9794
if (CompilationNotNeeded(generationState, out var offendingFiles, out var outputSeenChanges))

src/docs-builder/Cli/Commands.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,12 @@ public async Task<int> Generate(
144144

145145
if (runningOnCi)
146146
await githubActionsService.SetOutputAsync("skip", "false");
147+
148+
// always delete output folder on CI
147149
var set = new DocumentationSet(context, logger);
150+
if (runningOnCi)
151+
set.ClearOutputDirectory();
152+
148153

149154
if (bool.TryParse(githubActionsService.GetInput("metadata-only"), out var metaValue) && metaValue)
150155
metadataOnly ??= metaValue;

0 commit comments

Comments
 (0)