Skip to content

Commit f4f08aa

Browse files
authored
Merge pull request #452 from per1234/base-schema
Install referenced "base" schema in validation tasks
2 parents 5f576f2 + ccecf30 commit f4f08aa

File tree

2 files changed

+19
-0
lines changed

2 files changed

+19
-0
lines changed

Taskfile.yml

+13
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,10 @@ tasks:
364364
SCHEMA_URL: https://json.schemastore.org/dependabot-2.0
365365
SCHEMA_PATH:
366366
sh: task utility:mktemp-file TEMPLATE="dependabot-schema-XXXXXXXXXX.json"
367+
# Source: https://github.com/SchemaStore/schemastore/blob/master/src/schemas/json/base.json
368+
BASE_SCHEMA_URL: https://json.schemastore.org/base.json
369+
BASE_SCHEMA_PATH:
370+
sh: task utility:mktemp-file TEMPLATE="base-schema-XXXXXXXXXX.json"
367371
# The Dependabot configuration file for the repository.
368372
DATA_PATH: ".github/dependabot.yml"
369373
# The asset Dependabot configuration files.
@@ -372,17 +376,20 @@ tasks:
372376
sh: task utility:mktemp-folder TEMPLATE="dependabot-validate-XXXXXXXXXX"
373377
cmds:
374378
- wget --quiet --output-document="{{.SCHEMA_PATH}}" {{.SCHEMA_URL}}
379+
- wget --quiet --output-document="{{.BASE_SCHEMA_PATH}}" {{.BASE_SCHEMA_URL}}
375380
- |
376381
npx ajv-cli validate \
377382
--all-errors \
378383
--strict=false \
379384
-s "{{.SCHEMA_PATH}}" \
385+
-r "{{.BASE_SCHEMA_PATH}}" \
380386
-d "{{.DATA_PATH}}"
381387
- |
382388
npx ajv-cli validate \
383389
--all-errors \
384390
--strict=false \
385391
-s "{{.SCHEMA_PATH}}" \
392+
-r "{{.BASE_SCHEMA_PATH}}" \
386393
-d "{{.ASSETS_DATA_PATH}}"
387394
388395
docs:generate:
@@ -731,6 +738,10 @@ tasks:
731738
AVA_SCHEMA_URL: https://json.schemastore.org/ava.json
732739
AVA_SCHEMA_PATH:
733740
sh: task utility:mktemp-file TEMPLATE="ava-schema-XXXXXXXXXX.json"
741+
# Source: https://github.com/SchemaStore/schemastore/blob/master/src/schemas/json/base.json
742+
BASE_SCHEMA_URL: https://json.schemastore.org/base.json
743+
BASE_SCHEMA_PATH:
744+
sh: task utility:mktemp-file TEMPLATE="base-schema-XXXXXXXXXX.json"
734745
# Source: https://github.com/SchemaStore/schemastore/blob/master/src/schemas/json/eslintrc.json
735746
ESLINTRC_SCHEMA_URL: https://json.schemastore.org/eslintrc.json
736747
ESLINTRC_SCHEMA_PATH:
@@ -768,6 +779,7 @@ tasks:
768779
cmds:
769780
- wget --quiet --output-document="{{.SCHEMA_PATH}}" {{.SCHEMA_URL}}
770781
- wget --quiet --output-document="{{.AVA_SCHEMA_PATH}}" {{.AVA_SCHEMA_URL}}
782+
- wget --quiet --output-document="{{.BASE_SCHEMA_PATH}}" {{.BASE_SCHEMA_URL}}
771783
- wget --quiet --output-document="{{.ESLINTRC_SCHEMA_PATH}}" {{.ESLINTRC_SCHEMA_URL}}
772784
- wget --quiet --output-document="{{.JSCPD_SCHEMA_PATH}}" {{.JSCPD_SCHEMA_URL}}
773785
- wget --quiet --output-document="{{.NPM_BADGES_SCHEMA_PATH}}" {{.NPM_BADGES_SCHEMA_URL}}
@@ -781,6 +793,7 @@ tasks:
781793
--all-errors \
782794
-s "{{.SCHEMA_PATH}}" \
783795
-r "{{.AVA_SCHEMA_PATH}}" \
796+
-r "{{.BASE_SCHEMA_PATH}}" \
784797
-r "{{.ESLINTRC_SCHEMA_PATH}}" \
785798
-r "{{.JSCPD_SCHEMA_PATH}}" \
786799
-r "{{.NPM_BADGES_SCHEMA_PATH}}" \

workflow-templates/assets/check-npm-task/Taskfile.yml

+6
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ tasks:
2020
AVA_SCHEMA_URL: https://json.schemastore.org/ava.json
2121
AVA_SCHEMA_PATH:
2222
sh: task utility:mktemp-file TEMPLATE="ava-schema-XXXXXXXXXX.json"
23+
# Source: https://github.com/SchemaStore/schemastore/blob/master/src/schemas/json/base.json
24+
BASE_SCHEMA_URL: https://json.schemastore.org/base.json
25+
BASE_SCHEMA_PATH:
26+
sh: task utility:mktemp-file TEMPLATE="base-schema-XXXXXXXXXX.json"
2327
# Source: https://github.com/SchemaStore/schemastore/blob/master/src/schemas/json/eslintrc.json
2428
ESLINTRC_SCHEMA_URL: https://json.schemastore.org/eslintrc.json
2529
ESLINTRC_SCHEMA_PATH:
@@ -57,6 +61,7 @@ tasks:
5761
cmds:
5862
- wget --quiet --output-document="{{.SCHEMA_PATH}}" {{.SCHEMA_URL}}
5963
- wget --quiet --output-document="{{.AVA_SCHEMA_PATH}}" {{.AVA_SCHEMA_URL}}
64+
- wget --quiet --output-document="{{.BASE_SCHEMA_PATH}}" {{.BASE_SCHEMA_URL}}
6065
- wget --quiet --output-document="{{.ESLINTRC_SCHEMA_PATH}}" {{.ESLINTRC_SCHEMA_URL}}
6166
- wget --quiet --output-document="{{.JSCPD_SCHEMA_PATH}}" {{.JSCPD_SCHEMA_URL}}
6267
- wget --quiet --output-document="{{.NPM_BADGES_SCHEMA_PATH}}" {{.NPM_BADGES_SCHEMA_URL}}
@@ -70,6 +75,7 @@ tasks:
7075
--all-errors \
7176
-s "{{.SCHEMA_PATH}}" \
7277
-r "{{.AVA_SCHEMA_PATH}}" \
78+
-r "{{.BASE_SCHEMA_PATH}}" \
7379
-r "{{.ESLINTRC_SCHEMA_PATH}}" \
7480
-r "{{.JSCPD_SCHEMA_PATH}}" \
7581
-r "{{.NPM_BADGES_SCHEMA_PATH}}" \

0 commit comments

Comments
 (0)