Skip to content
Snippets Groups Projects
Unverified Commit 63151a42 authored by Michael Kriese's avatar Michael Kriese Committed by GitHub
Browse files

fix(worker/autodiscover): retain repo order on filtering (#32402)

parent f66b8f9a
No related branches found
No related tags found
No related merge requests found
......@@ -167,9 +167,11 @@ describe('workers/global/autodiscover', () => {
hostRules.find = jest.fn(() => ({
token: 'abc',
}));
// retains order
const expectedRepositories = [
'another-project/repo',
'department/dev/aProject',
'another-project/repo',
'department/dev/bProject',
];
ghApi.getRepos = jest.fn(() =>
Promise.resolve([
......
......@@ -51,6 +51,10 @@ export async function autodiscoverRepositories(
}
logger.debug(`Autodiscovered ${discovered.length} repositories`);
logger.trace(
{ length: discovered.length, repositories: discovered },
`Autodiscovered repositories`,
);
if (autodiscoverFilter) {
logger.debug({ autodiscoverFilter }, 'Applying autodiscoverFilter');
......@@ -116,5 +120,5 @@ export function applyFilters(repos: string[], filters: string[]): string[] {
matched.add(repository);
}
}
return [...matched];
return repos.filter((repository) => matched.has(repository));
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment