Improve Makefile

Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>

Author: jviotti

.github/workflows/ci.yml

@@ -19,5 +19,5 @@ jobs:
     steps:
       - run: sudo snap install jsonschema
       - uses: actions/checkout@v4
-      - run: make ci-lint
-      - run: make ci-test
+      - run: make lint
+      - run: make test

Makefile

@@ -3,33 +3,23 @@ SHELLCHECK = shellcheck
 
 # TODO: Extend `validate` to take a directory as argument
 SCHEMAS = $(shell find schemas/ -type f -name '*.json')
+TESTS = $(shell find tests/ -type f -name '*.json')
 
-all: .always
-	$(JSONSCHEMA) fmt conventions.json --verbose
-	$(JSONSCHEMA) metaschema conventions.json --verbose
-	$(JSONSCHEMA) lint conventions.json --verbose
-	$(JSONSCHEMA) fmt --verbose
-	$(JSONSCHEMA) fmt tests --verbose
-	$(JSONSCHEMA) metaschema --verbose
-	$(JSONSCHEMA) validate conventions.json --verbose $(SCHEMAS)
-	$(JSONSCHEMA) lint --verbose
-	$(SHELLCHECK) scripts/*.sh
-	./scripts/schemas-tests-mirror.sh
-	$(JSONSCHEMA) test ./tests --verbose
+all: common test
+	$(JSONSCHEMA) fmt schemas tests conventions.json tests.json --verbose
 
-ci-lint: .always
-	$(JSONSCHEMA) fmt conventions.json --verbose --check
-	$(JSONSCHEMA) metaschema conventions.json --verbose
-	$(JSONSCHEMA) lint conventions.json --verbose
-	$(JSONSCHEMA) fmt --verbose --check
-	$(JSONSCHEMA) fmt tests --verbose --check
-	$(JSONSCHEMA) metaschema --verbose
+common: .always
+	$(JSONSCHEMA) metaschema schemas conventions.json tests.json --verbose
+	$(JSONSCHEMA) lint schemas conventions.json tests.json --verbose
 	$(JSONSCHEMA) validate conventions.json --verbose $(SCHEMAS)
-	$(JSONSCHEMA) lint --verbose
+	$(JSONSCHEMA) validate tests.json --verbose $(TESTS)
 	$(SHELLCHECK) scripts/*.sh
 	./scripts/schemas-tests-mirror.sh
 
-ci-test: .always
+lint: common
+	$(JSONSCHEMA) fmt schemas tests conventions.json tests.json --verbose --check
+
+test: .always
 	$(JSONSCHEMA) test ./tests --verbose
 
 .always:

tests.json

@@ -0,0 +1,10 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "type": "object",
+  "required": [ "x-license" ],
+  "properties": {
+    "x-license": {
+      "const": "https://github.com/sourcemeta/std/blob/main/LICENSE"
+    }
+  }
+}