Skip to content

Commit 8ef142b

Browse files
authored
Replace local CircleCI schema with official one (SchemaStore#4604)
1 parent 37816d8 commit 8ef142b

File tree

3 files changed

+15
-1567
lines changed

3 files changed

+15
-1567
lines changed

cli.js

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1588,14 +1588,22 @@ function assertSchemaValidationJsonHasValidSkipTest() {
15881588
for (const schemaName of SchemaValidation.skiptest) {
15891589
const folderName = schemaName.replace(/\.json$/, '')
15901590

1591-
if (FoldersPositiveTest.includes(folderName)) {
1591+
const allowedExtraneousDirs = ['circleciconfig'] // TODO: Remove this
1592+
1593+
if (
1594+
FoldersPositiveTest.includes(folderName) &&
1595+
!allowedExtraneousDirs.includes(folderName)
1596+
) {
15921597
printErrorAndExit(new Error(), [
15931598
`Did not expect to find positive test directory at "./${path.join(TestPositiveDir, folderName)}"`,
15941599
`Because filename "${schemaName}" is listed under "skiptest", it should not have any positive test files`,
15951600
])
15961601
}
15971602

1598-
if (FoldersNegativeTest.includes(folderName)) {
1603+
if (
1604+
FoldersNegativeTest.includes(folderName) &&
1605+
!allowedExtraneousDirs.includes(folderName)
1606+
) {
15991607
printErrorAndExit(new Error(), [
16001608
`Did not expect to find negative test directory at "./${path.join(TestNegativeDir, folderName)}"`,
16011609
`Because filename "${schemaName}" is listed under "skiptest", it should not have any negative test files`,

src/schema-validation.jsonc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
"catalog-info.json",
4242
"chrome-manifest.json",
4343
"chutzpah.json",
44-
"circleciconfig.json",
4544
"cirrus.json",
4645
"cloud-sdk-pipeline-config-schema.json",
4746
"cloudify.json",
@@ -385,7 +384,8 @@
385384
"xunit-2.3.json",
386385
"xunit.runner.schema.json",
387386
"gitversion.json",
388-
"lazygit.json"
387+
"lazygit.json",
388+
"circleciconfig.json"
389389
],
390390
"catalogEntryNoLintNameOrDescription": [
391391
"https://json-schema.org/draft-04/schema",

0 commit comments

Comments
 (0)