Skip to content

Fix speculative build matching for CD-workflow repositories #3737

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mpdreamz merged 1 commit into from
Jul 28, 2026
Merged

Fix speculative build matching for CD-workflow repositories #3737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/Elastic.Documentation.Configuration/Assembler/AssemblyConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,9 @@ public ContentSourceMatch Match(ILoggerFactory logFactory, string repository, st
var current = r.GetBranch(ContentSource.Current);
var next = r.GetBranch(ContentSource.Next);
var edge = r.GetBranch(ContentSource.Edge);
logger.LogInformation("Active content-sources for {Repository}. current: {Current}, next: {Next}, edge: {Edge}' ", repository, current, next, edge);
var isCdWorkflow = current == next && next == edge;
logger.LogInformation("Active content-sources for {Repository}. current: {Current}, next: {Next}, edge: {Edge} (branching strategy: {Strategy})",
repository, current, next, edge, isCdWorkflow ? "cd/continuous-deployment" : "tagged-release");
if (current == branchOrTag)
{
logger.LogInformation("Content-Source current: {Current} matches: {Branch}", current, branchOrTag);
Expand Down
8 changes: 6 additions & 2 deletions ...services/Elastic.Documentation.Assembler/ContentSources/RepositoryBuildMatchingService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,15 @@ public async Task<bool> ShouldBuild(IDiagnosticsCollector collector, string? rep
if (string.IsNullOrEmpty(refName))
throw new ArgumentNullException(nameof(branchOrTag));

// the link registry uses short repository names (e.g. "kibana"), not full names (e.g. "elastic/kibana")
var repoTokens = repo.Split('/');
var repositoryName = repoTokens.Last();

// environment does not matter to check the configuration, defaulting to dev
var linkIndexProvider = Aws3LinkIndexReader.CreateAnonymous();
var linkRegistry = await GetRegistryWithRetry(linkIndexProvider, ctx);
var alreadyPublishing = linkRegistry.Repositories.ContainsKey(repo);
_logger.LogInformation("'{Repository}' publishing to link registry: {PublishState} ", repo, alreadyPublishing);
var alreadyPublishing = linkRegistry.Repositories.ContainsKey(repositoryName);
_logger.LogInformation("'{Repository}' (registry key: '{RepositoryName}') publishing to link registry: {PublishState} ", repo, repositoryName, alreadyPublishing);
var assembleContext = new AssembleContext(configuration, configurationContext, "dev", collector, fileSystem, fileSystem, null, null);
var product = assembleContext.ProductsConfiguration.GetProductByRepositoryName(repo);
var matches = assembleContext.Configuration.Match(logFactory, repo, refName, product, alreadyPublishing);
Expand Down
Loading