diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 24e64db..f82403f 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -17,7 +17,7 @@ jobs: package: runs-on: ubuntu-latest steps: - - uses: sourcemeta/jsonschema@v12.5.1 + - uses: sourcemeta/jsonschema@v12.6.0 - uses: actions/checkout@v4 - run: make lint - run: make test diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fa05c69..f557c91 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: test: runs-on: ubuntu-latest steps: - - uses: sourcemeta/jsonschema@v12.5.1 + - uses: sourcemeta/jsonschema@v12.6.0 - uses: actions/checkout@v4 - run: make lint - run: make test diff --git a/Makefile b/Makefile index d9a29b2..c13338d 100644 --- a/Makefile +++ b/Makefile @@ -10,10 +10,6 @@ GZIP ?= gzip MKDIRP ?= mkdir -p RMRF ?= rm -rf -# TODO: Extend `validate` to take a directory as argument -SCHEMAS = $(shell find schemas/ -type f -name '*.json') -TESTS = $(shell find test/ -type f -name '*.json') - include generated.mk # TODO: Make `jsonschema fmt` automatically detect test files @@ -25,9 +21,9 @@ all: common test common: $(GENERATED) $(JSONSCHEMA) metaschema schemas meta $(JSONSCHEMA) lint schemas meta - $(JSONSCHEMA) validate meta/schemas-root.json $(SCHEMAS) - $(JSONSCHEMA) validate meta/schemas.json $(SCHEMAS) - $(JSONSCHEMA) validate meta/test.json $(TESTS) + $(JSONSCHEMA) validate meta/schemas-root.json schemas + $(JSONSCHEMA) validate meta/schemas.json schemas + $(JSONSCHEMA) validate meta/test.json test $(SHELLCHECK) scripts/*.sh ./scripts/quality-schemas-tests-mirror.sh ./scripts/quality-templates-xbrl-utr-mirror.sh