diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 0758d29f26..50724407ff 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -8,6 +8,7 @@ on: jobs: # Run "pre-commit run --all-files" pre-commit: + name: Run pre-commit checks runs-on: ubuntu-latest timeout-minutes: 5 @@ -20,6 +21,7 @@ jobs: pre-commit run --all-files --hook-stage manual || (git diff; false) mkdocs: + name: Check docs runs-on: ubuntu-latest timeout-minutes: 5 diff --git a/.github/workflows/unified-test-format-schema-check.yml b/.github/workflows/unified-test-format-schema-check.yml deleted file mode 100644 index 850983d574..0000000000 --- a/.github/workflows/unified-test-format-schema-check.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: Check unified test format files against schema - -on: - push: - branches: [master] - pull_request: ~ - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v2 - with: - python-version: 3.x - - name: Set up npm - uses: actions/setup-node@v2 - with: - node-version: lts/* - - name: Install dependencies - run: | - npm install -g ajv-cli js-yaml - - name: Check unified format test files against schema - working-directory: source/unified-test-format/tests - run: make - - name: Check all unified tests schema version is valid - run: bash .github/workflows/check_schema_version.sh - - name: Check schema-latest.json has been updated - run: bash .github/workflows/check-schema-latest.sh diff --git a/.github/workflows/json-regenerate-check.yml b/.github/workflows/unified-tests.yml similarity index 59% rename from .github/workflows/json-regenerate-check.yml rename to .github/workflows/unified-tests.yml index 34a194ec68..cf3c651eb2 100644 --- a/.github/workflows/json-regenerate-check.yml +++ b/.github/workflows/unified-tests.yml @@ -1,4 +1,4 @@ -name: Check if all JSON test files are up-to-date +name: Unified Tests on: push: @@ -6,7 +6,34 @@ on: pull_request: ~ jobs: - build: + schema-check: + name: Check unified test format files against schema + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: 3.x + - name: Set up npm + uses: actions/setup-node@v2 + with: + node-version: lts/* + - name: Install dependencies + run: | + npm install -g ajv-cli js-yaml + - name: Check unified format test files against schema + working-directory: source/unified-test-format/tests + run: make + - name: Check all unified tests schema version is valid + run: bash .github/workflows/check_schema_version.sh + - name: Check schema-latest.json has been updated + run: bash .github/workflows/check-schema-latest.sh + + json-check: + name: Check if all JSON test files are up-to-date runs-on: ubuntu-latest