Skip to content

Commit e88f263

Browse files
authored
Merge pull request spdx#96 from JPEWdev/spdx3-validate
gha: Use spdx3-validate to validate documents
2 parents 7e2112d + 1ca6d7b commit e88f263

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

.github/workflows/pull_request.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,7 @@ jobs:
6060
- name: Setup Python tools
6161
run: |
6262
python3 -m pip install -U pip
63-
python3 -m pip install \
64-
check-jsonschema \
65-
pyshacl
63+
python3 -m pip install spdx3-validate
6664
6765
- name: Validate SPDX 2.2 & SPDX 2.3 Documents
6866
run: |
@@ -72,11 +70,8 @@ jobs:
7270
7371
- name: Validate SPDX 3.0 Documents
7472
run: |
75-
SPDX30_SCHEMA_URL="https://spdx.org/schema/3.0.0/spdx-json-schema.json"
76-
SPDX30_SHACL_URL="https://spdx.org/rdf/3.0.0/spdx-model.ttl"
77-
7873
for f in $(find . -type f -path '*/spdx3.0/*.json'); do
7974
echo "Checking $f..."
80-
check-jsonschema -v --schemafile $SPDX30_SCHEMA_URL $f
81-
pyshacl -s $SPDX30_SHACL_URL -e $SPDX30_SHACL_URL $f
75+
spdx3-validate -j $f
8276
done
77+

0 commit comments

Comments
 (0)