diff --git a/.github/workflows/linkchecker.yaml b/.github/workflows/ci.yaml similarity index 80% rename from .github/workflows/linkchecker.yaml rename to .github/workflows/ci.yaml index 065be04..063c1ec 100644 --- a/.github/workflows/linkchecker.yaml +++ b/.github/workflows/ci.yaml @@ -2,7 +2,9 @@ name: "CI" on: - pull_request: + push: + branches: main + pull_request: {} jobs: linkchecker: @@ -19,10 +21,14 @@ jobs: env: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} + jsonschema: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 - name: Setup Go uses: actions/setup-go@v5 with: - go-version: "1.22" + go-version: 'stable' - name: Check Schema env: diff --git a/Makefile b/Makefile index 28b2daa..b2b9177 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,7 @@ test-examples: ${GOPATH}/bin/jv ifeq ($(SCORE_EXAMPLES_DIR),) $(error SCORE_EXAMPLES_DIR must be set) endif - find ${SCORE_EXAMPLES_DIR} -name 'score*.yaml' -print -exec ${GOPATH}/bin/jv --assert-format --assert-content ./score-v1b1.json {} \; + for f in $$(find ${SCORE_EXAMPLES_DIR} -name 'score*.yaml' -print); do ${GOPATH}/bin/jv --assert-format --assert-content ./score-v1b1.json $$f; done @echo "Schema matches all samples" ## Run all tests diff --git a/samples/score-full.yaml b/samples/score-full.yaml index 55df5c7..8b51d2b 100644 --- a/samples/score-full.yaml +++ b/samples/score-full.yaml @@ -70,6 +70,6 @@ resources: data: here resource-two2: type: Resource-Two - resource.three: + resource-three: type: Type-Three id: shared-type-three