Skip to content

Commit

Permalink
Merge branch 'master' into hyperupcall-multivalidation
Browse files Browse the repository at this point in the history
  • Loading branch information
hyperupcall committed Aug 21, 2024
2 parents f02e6ba + c5a1566 commit 9a4ee2a
Show file tree
Hide file tree
Showing 13 changed files with 51 additions and 159 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request_new_schema.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ body:
description: Who will make the PR?
multiple: false
options:
- Yes, I will create a PR.
- No, someone else must create the PR.
- Yes, I will create a PR.
validations:
required: true
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request_website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ body:
description: Who will make the PR?
multiple: false
options:
- Yes, I will create a PR.
- No, someone else must create the PR.
- Yes, I will create a PR.
validations:
required: true
7 changes: 1 addition & 6 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
<!--
Thank you for submitting a pull request to SchemaStore.
Before continuing, please read the guidelines:
Before continuing, please read the contributing guidelines:
https://github.com/SchemaStore/schemastore/blob/master/CONTRIBUTING.md
Adding a JSON schema file to the catalog is required.
Add tests files. (.json, .yml, .yaml or .toml)
Use the most recent JSON Schema version that's well supported by editors and IDEs, currently draft-07.
JSON formatted according to the .editorconfig settings.
-->
83 changes: 31 additions & 52 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,72 +1,51 @@
# Asp.Net files must not be updated.
WARNING_AspNetFiles:
# Changes to continuous integration.
ci:
- changed-files:
- any-glob-to-any-file:
- 'src/bin/**/*'
- 'src/css/**/*'
- 'src/img/**/*'
- 'src/js/**/*'
- '**/*.sln'
- '**/*.cshtml'
- '**/*.config'
- '**/*.webinfo'
- '**/*.ico'
- '**/*.txt'
- '.github/**/*'

# code change
gruntfile:
# Changes to JavaScript. This label used to have the name of "Gruntfile.js".
# This label also supersedes the old "NodeJS" label, which was too broad.
'cli.js':
- changed-files:
- any-glob-to-any-file:
- 'src/cli.js'
- 'cli.js'
- 'package.json'

# schema setting change
schema-validation.jsonc:
# Changes to configuration.
'config:editorconfig':
- changed-files:
- any-glob-to-any-file:
- 'src/schema-validation.jsonc'

# possible code change
ci:
- '.editorconfig'
'config:eslintrcjson':
- changed-files:
- any-glob-to-any-file:
- '.github/**/*'

# possible code change
NodeJS:
- 'src/.eslintrc.json'
'config:gitignore':
- changed-files:
- any-glob-to-any-file:
- '.github/**/*'
- 'src/package.json'
- 'src/package-lock.json'
- '.gitignore'
- '.gitattributes'

# possible URL change
# Changes to documentation.
documentation:
- changed-files:
- any-glob-to-any-file:
- '**/*.md'

# formatting change
editorconfig:
- changed-files:
- any-glob-to-any-file:
- '.editorconfig'

# lint change
eslintrcjson:
- changed-files:
- any-glob-to-any-file:
- 'src/.eslintrc.json'

# .gitignore change
gitignore:
# Changes to Asp.Net files. Generally, they must NOT be updated.
WARNING_AspNetFiles:
- changed-files:
- any-glob-to-any-file:
- '.gitignore'
- '.gitattributes'
# Do not add "api", "schema" and "test" directories.
# Those are the usual commit. No need for extra attention.
# src/api/**/*
# src/schema/*
# src/test/**/*
# src/negative_test/**/*

- 'src/bin/**/*'
- 'src/css/**/*'
- 'src/img/**/*'
- 'src/js/**/*'
- '**/*.sln'
- '**/*.cshtml'
- '**/*.config'
- '**/*.webinfo'
- '**/*.ico'
- '**/*.txt'
# Do not add "src/{api,schemas,test}", etc. directories;
# they are not special.
4 changes: 2 additions & 2 deletions .github/workflows/codeowners-merge.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'Codeowners merging'
name: 'Maintenance: Codeowners Detection and Mention'
on:
pull_request_target: { types: [opened] }
issue_comment: { types: [created] }
Expand All @@ -11,7 +11,7 @@ jobs:
permissions: 'write-all'
steps:
- uses: 'actions/checkout@v4'
- name: 'Run Codeowners merge check'
- name: 'Run Codeowners check'
uses: 'OSS-Docs-Tools/code-owner-self-merge@3d0e2871b850d624a5a433fb7143fe4522ba5486'
env:
GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
Expand Down
61 changes: 0 additions & 61 deletions .github/workflows/codeql-analysis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'Pull Request Labeler'
name: 'Maintenance: Label Pull Requests'
on:
- pull_request_target

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Lint
name: 'Maintenance: Lint'

on: [push, pull_request]

Expand Down
13 changes: 5 additions & 8 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: Node.js CI
name: 'Validate JSON Schemas'

on: [push, pull_request]

jobs:
build:
check:
runs-on: ubuntu-latest
timeout-minutes: 10

Expand All @@ -14,9 +14,6 @@ jobs:
node-version: '18'
cache: 'npm'
cache-dependency-path: './package-lock.json'
- name: npm ci
run: |
npm ci
- name: npm run build
run: |
npm run build
- run: 'npm clean-install'
- run: 'npm run eslint'
- run: 'npm run check'
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'Close stale PRs'
name: 'Maintenance: Close Stale PRs'
on:
schedule:
- cron: '30 1 * * *'
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ cd schemastore
Be sure that [NodeJS](https://nodejs.org) is installed. The minimum required NodeJS version is defined by the `engines` key in [package.json](package.json). Now, install dependencies and run the `new-schema` task:

```sh
npm ci
npm clean-install
npm run new-schema
```

Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
The largest collection of independent JSON schemas in the world.

[![Build status](https://github.com/SchemaStore/schemastore/actions/workflows/nodejs.yml/badge.svg)](https://github.com/SchemaStore/schemastore/actions/workflows/nodejs.yml)
[![CodeQL](https://github.com/SchemaStore/schemastore/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/SchemaStore/schemastore/actions/workflows/codeql-analysis.yml)

The repository is a universal JSON schema store, where schemas for popular JSON documents can be found.

Expand Down
29 changes: 6 additions & 23 deletions src/api/json/catalog.json
Original file line number Diff line number Diff line change
Expand Up @@ -1921,13 +1921,7 @@
{
"name": ".esmrc.json",
"description": "Configuration files for the esm module/package in Node.js",
"fileMatch": [
".esmrc",
".esmrc.json",
".esmrc.js",
".esmrc.cjs",
".esmrc.mjs"
],
"fileMatch": [".esmrc", ".esmrc.json"],
"url": "https://json.schemastore.org/esmrc.json"
},
{
Expand Down Expand Up @@ -2521,7 +2515,6 @@
".meshrc.yml",
".meshrc.yaml",
".meshrc.json",
".meshrc.js",
".graphql-mesh.yaml",
".graphql-mesh.yml"
],
Expand All @@ -2532,14 +2525,12 @@
"description": "GraphQL Config config file",
"fileMatch": [
"graphql.config.json",
"graphql.config.js",
"graphql.config.yaml",
"graphql.config.yml",
".graphqlrc",
".graphqlrc.json",
".graphqlrc.yaml",
".graphqlrc.yml",
".graphqlrc.js"
".graphqlrc.yml"
],
"url": "https://unpkg.com/graphql-config/config-schema.json"
},
Expand All @@ -2550,11 +2541,9 @@
"codegen.yml",
"codegen.yaml",
"codegen.json",
"codegen.js",
".codegen.yml",
".codegen.yaml",
".codegen.json",
".codegen.js"
".codegen.json"
],
"url": "https://www.graphql-code-generator.com/config.schema.json"
},
Expand Down Expand Up @@ -4995,7 +4984,7 @@
{
"name": ".versionrc.json",
"description": "Conventional Changelog Configuration file",
"fileMatch": [".versionrc", ".versionrc.json", ".versionrc.js"],
"fileMatch": [".versionrc", ".versionrc.json"],
"url": "https://raw.githubusercontent.com/conventional-changelog/conventional-changelog-config-spec/master/versions/2.2.0/schema.json",
"versions": {
"1.0.0": "https://raw.githubusercontent.com/conventional-changelog/conventional-changelog-config-spec/master/versions/1.0.0/schema.json",
Expand Down Expand Up @@ -5349,7 +5338,7 @@
{
"name": "jsdoc",
"description": "JSDoc configuration file",
"fileMatch": ["conf.js*", "jsdoc.js*"],
"fileMatch": ["conf.json", "jsdoc.json"],
"url": "https://json.schemastore.org/jsdoc-1.0.0.json"
},
{
Expand Down Expand Up @@ -5965,13 +5954,7 @@
{
"name": "GherKing",
"description": "GherKing configuration",
"fileMatch": [
".gherking.json",
".gherkingrc",
".gherking.js",
"gherking.json",
"gherking.js"
],
"fileMatch": [".gherking.json", ".gherkingrc", "gherking.json"],
"url": "https://raw.githubusercontent.com/gherking/gherking/master/schema/gherking.schema.json"
},
{
Expand Down

0 comments on commit 9a4ee2a

Please sign in to comment.