-
Notifications
You must be signed in to change notification settings - Fork 2.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into gradle/test-refactor
- Loading branch information
Showing
15 changed files
with
144 additions
and
155 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,9 @@ | ||
| import { z } from 'zod'; | ||
| import { Yaml } from '../../../util/schema-utils'; | ||
|
|
||
| export const BitriseStepFile = z.object({ | ||
| published_at: z.string(), | ||
| source_code_url: z.string().optional(), | ||
| }); | ||
| export const BitriseStepFile = Yaml.pipe( | ||
| z.object({ | ||
| published_at: z.string(), | ||
| source_code_url: z.string().optional(), | ||
| }), | ||
| ); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| import { z } from 'zod'; | ||
| import { LooseArray, Yaml } from '../../../util/schema-utils'; | ||
| import type { ReleaseResult } from '../types'; | ||
| import { conanDatasourceRegex } from './common'; | ||
|
|
||
| export const ConanCenterReleases = Yaml.pipe( | ||
| z.object({ | ||
| versions: z.record(z.string(), z.unknown()), | ||
| }), | ||
| ) | ||
| .transform( | ||
| ({ versions }): ReleaseResult => ({ | ||
| releases: Object.keys(versions).map((version) => ({ version })), | ||
| }), | ||
| ) | ||
| .nullable() | ||
| .catch(null); | ||
|
|
||
| export const ConanJSON = z | ||
| .object({ | ||
| results: z | ||
| .string() | ||
| .array() | ||
| .transform((array) => | ||
| array.map((val) => val.match(conanDatasourceRegex)?.groups), | ||
| ) | ||
| .pipe( | ||
| LooseArray( | ||
| z.object({ | ||
| name: z.string(), | ||
| version: z.string(), | ||
| userChannel: z.string(), | ||
| }), | ||
| ), | ||
| ), | ||
| }) | ||
| .transform(({ results }) => results) | ||
| .nullable() | ||
| .catch(null); | ||
|
|
||
| export const ConanRevisionJSON = z.object({ | ||
| revision: z.string(), | ||
| time: z.string(), | ||
| }); | ||
|
|
||
| export const ConanLatestRevision = z | ||
| .object({ revisions: z.unknown().array() }) | ||
| .transform(({ revisions }) => revisions[0]) | ||
| .pipe(ConanRevisionJSON) | ||
| .transform(({ revision }) => revision) | ||
| .nullable() | ||
| .catch(null); | ||
|
|
||
| export const ConanProperties = z | ||
| .object({ | ||
| properties: z.object({ | ||
| 'conan.package.url': z.union([ | ||
| z.string().transform((url) => [url]), | ||
| z.string().array(), | ||
| ]), | ||
| }), | ||
| }) | ||
| .transform(({ properties }) => { | ||
| const sourceUrl = properties['conan.package.url'][0]; | ||
| return { sourceUrl }; | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,35 +1,4 @@ | ||
| export interface ConanJSON { | ||
| results?: Record<string, string>; | ||
| } | ||
|
|
||
| export interface ConanRevisionJSON { | ||
| revision: string; | ||
| time: string; | ||
| } | ||
|
|
||
| export interface ConanRevisionsJSON { | ||
| revisions?: Record<string, ConanRevisionJSON>; | ||
| } | ||
|
|
||
| export interface ConanYAML { | ||
| versions?: Record<string, unknown>; | ||
| } | ||
|
|
||
| export interface ConanPackage { | ||
| conanName: string; | ||
| userAndChannel: string; | ||
| } | ||
|
|
||
| export interface ConanRecipeProperties { | ||
| 'conan.package.channel': string[]; | ||
| 'conan.package.license': string[]; | ||
| 'conan.package.name': string[]; | ||
| 'conan.package.url': string[]; | ||
| 'conan.package.user': string[]; | ||
| 'conan.package.version': string[]; | ||
| } | ||
|
|
||
| export interface ConanProperties { | ||
| properties: ConanRecipeProperties; | ||
| uri: string; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.