Skip to content

Commit 33c9ca1

Browse files
committed
Improved CI setup
Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>
1 parent c8d8a85 commit 33c9ca1

2 files changed

Lines changed: 17 additions & 2 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@ jobs:
1919
steps:
2020
- run: sudo snap install jsonschema
2121
- uses: actions/checkout@v4
22-
- run: make
22+
- run: make ci-lint
23+
- run: make ci-test

Makefile

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ SHELLCHECK = shellcheck
44
# TODO: Extend `validate` to take a directory as argument
55
SCHEMAS = $(shell find schemas/ -type f -name '*.json')
66

7-
all:
7+
all: .always
88
$(JSONSCHEMA) fmt conventions.json --verbose
99
$(JSONSCHEMA) metaschema conventions.json --verbose
1010
$(JSONSCHEMA) lint conventions.json --verbose
@@ -16,4 +16,18 @@ all:
1616
./scripts/schemas-tests-mirror.sh
1717
$(JSONSCHEMA) test ./tests --verbose
1818

19+
ci-lint: .always
20+
$(JSONSCHEMA) fmt conventions.json --verbose --check
21+
$(JSONSCHEMA) metaschema conventions.json --verbose
22+
$(JSONSCHEMA) lint conventions.json --verbose
23+
$(JSONSCHEMA) fmt --verbose --check
24+
$(JSONSCHEMA) metaschema --verbose
25+
$(JSONSCHEMA) validate conventions.json --verbose $(SCHEMAS)
26+
$(JSONSCHEMA) lint --verbose
27+
$(SHELLCHECK) scripts/*.sh
28+
./scripts/schemas-tests-mirror.sh
29+
30+
ci-test: .always
31+
$(JSONSCHEMA) test ./tests --verbose
32+
1933
.always:

0 commit comments

Comments
 (0)