Skip to content

Commit e746331

Browse files
authored
fix(circleci): Ignore non-image alias items (#35212)
1 parent 57972f6 commit e746331

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

lib/modules/manager/circleci/extract.ts

+2-4
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,11 @@ export function extractPackageFile(
5858
): PackageFileContent | null {
5959
const deps: PackageDependency[] = [];
6060
try {
61-
const parsed = parseSingleYaml(content, {
62-
customSchema: CircleCiFile,
63-
});
61+
const parsed = CircleCiFile.parse(parseSingleYaml(content));
6462

6563
deps.push(...extractDefinition(parsed, config));
6664

67-
for (const alias of coerceArray(parsed.aliases)) {
65+
for (const alias of parsed.aliases) {
6866
deps.push({
6967
...getDep(alias.image, true, config?.registryAliases),
7068
depType: 'docker',

lib/modules/manager/circleci/schema.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { z } from 'zod';
2+
import { LooseArray } from '../../../util/schema-utils';
23

34
export const CircleCiDocker = z.object({
45
image: z.string(),
@@ -26,7 +27,7 @@ export const CircleCiOrb: z.ZodType<Orb> = baseOrb.extend({
2627
export type CircleCiOrb = z.infer<typeof CircleCiOrb>;
2728

2829
export const CircleCiFile = z.object({
29-
aliases: z.array(CircleCiDocker).optional(),
30+
aliases: LooseArray(CircleCiDocker).catch([]),
3031
executors: z.record(z.string(), CircleCiJob).optional(),
3132
jobs: z.record(z.string(), CircleCiJob).optional(),
3233
orbs: z.record(z.string(), z.union([z.string(), CircleCiOrb])).optional(),

0 commit comments

Comments
 (0)