Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into modify_rust-toolcha…
Browse files Browse the repository at this point in the history
…in_schema
  • Loading branch information
gfgafn committed Sep 19, 2024
2 parents e236510 + e3a7b30 commit 7ccca0f
Show file tree
Hide file tree
Showing 1,904 changed files with 1,158,903 additions and 70,343 deletions.
5 changes: 4 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.{json,toml}]
[*.{js,json,toml}]
indent_style = space
indent_size = 2

Expand All @@ -23,3 +23,6 @@ trim_trailing_whitespace = false
[*.cshtml]
indent_style = space
indent_size = 4

[*.sh]
indent_style = tab
6 changes: 6 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,9 @@

# style: Format YAML files at project root
d7eacc4d28028b906e505d21101ec904d8a3ceb8

# Deindent standalone functions (in Gruntfile)
36a6cccf396db9ac67937b4d0720548aa1868f7f

# Unindent Grunt task functions
ec2eff2d4485dff86239bd32cb5fc7f5acc76a4e
12 changes: 11 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# These owners will be the default owners for everything in
# the repo, unless a later match takes precedence.
* @madskristensen
* @madskristensen @hyperupcall

# Managed by Ansible DevTools Team members:
src/schemas/json/ansible-* @ssbarnea @webknjaz
Expand All @@ -13,3 +13,13 @@ src/test/yamllint/ansible-* @ssbarnea @webknjaz
src/schemas/json/zuul.json @ssbarnea
src/test/zuul/ @ssbarnea
src/negative_test/zuul/ @ssbarnea

# Managed by CircleCI Developer Experience team:
src/schemas/json/circleciconfig.json @CircleCI-Public/developer-experience
src/test/circleciconfig/ @CircleCI-Public/developer-experience
src/negative_test/circleciconfig/ @CircleCI-Public/developer-experience

# Managed by JetBrains YouTrack team
src/schemas/json/youtrack-app.json @skoch13 @andrey-skl @zmaks
src/test/youtrack-app/ @skoch13 @andrey-skl @zmaks
src/negative_test/youtrack-app/ @skoch13 @andrey-skl @zmaks
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,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_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
8 changes: 1 addition & 7 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,12 +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.
-->
10 changes: 10 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
version: 2
updates:
- package-ecosystem: 'github-actions'
directory: '/'
schedule:
interval: 'monthly'
groups:
github-actions:
patterns:
- '*'
106 changes: 50 additions & 56 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,57 +1,51 @@
# Asp.Net files must not be updated.
# Changes to continuous integration.
ci:
- changed-files:
- any-glob-to-any-file:
- '.github/**/*'

# 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:
- 'cli.js'
- 'package.json'

# Changes to configuration.
'config:editorconfig':
- changed-files:
- any-glob-to-any-file:
- '.editorconfig'
'config:eslintrcjson':
- changed-files:
- any-glob-to-any-file:
- 'src/.eslintrc.json'
'config:gitignore':
- changed-files:
- any-glob-to-any-file:
- '.gitignore'
- '.gitattributes'

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

# Changes to Asp.Net files. Generally, they must NOT be updated.
WARNING_AspNetFiles:
- 'src/bin/**/*'
- 'src/css/**/*'
- 'src/img/**/*'
- 'src/js/**/*'
- '**/*.sln'
- '**/*.cshtml'
- '**/*.config'
- '**/*.webinfo'
- '**/*.ico'
- '**/*.txt'

# code change
gruntfile.cjs:
- 'src/Gruntfile.cjs'

# schema setting change
schema-validation.json:
- 'src/schema-validation.json'

# possible code change
GitHub_ci_folder:
- '.github/**/*'

# possible code change
makefile:
- 'Makefile'

# possible code change
NodeJs:
- 'src/package.json'
- 'src/package-lock.json'

# possible URL change
doc_md:
- '**/*.md'

# formatting change
editorconfig:
- '.editorconfig'

# lint change
eslintrcjson:
- 'src/.eslintrc.json'

# .gitignore change
gitignore:
- '.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/**/*

- changed-files:
- any-glob-to-any-file:
- '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.
20 changes: 20 additions & 0 deletions .github/workflows/codeowners-merge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: 'Maintenance: Codeowners Detection and Mention'
on:
pull_request_target: { types: [opened] }
issue_comment: { types: [created] }
pull_request_review: { types: [submitted] }

jobs:
codeowners-merge:
if: "github.repository == 'SchemaStore/schemastore' && github.event.pull_request.draft == false"
runs-on: ubuntu-latest
permissions: 'write-all'
steps:
- uses: 'actions/checkout@v4'
- name: 'Run Codeowners check'
uses: 'OSS-Docs-Tools/code-owner-self-merge@3d0e2871b850d624a5a433fb7143fe4522ba5486'
env:
GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
with:
merge_method: 'squash'
ownerNoPings: '["@hyperupcall"]'
61 changes: 0 additions & 61 deletions .github/workflows/codeql-analysis.yml

This file was deleted.

5 changes: 3 additions & 2 deletions .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
name: 'Pull Request Labeler'
name: 'Maintenance: Label Pull Requests'
on:
- pull_request_target

jobs:
triage:
if: github.repository == 'SchemaStore/schemastore'
runs-on: ubuntu-latest
steps:
- uses: actions/labeler@v4
- uses: actions/labeler@v5
with:
repo-token: '${{ secrets.GITHUB_TOKEN }}'
sync-labels: true
6 changes: 3 additions & 3 deletions .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 All @@ -8,13 +8,13 @@ jobs:
name: Lint for editorconfig violations
steps:
- name: Checkout the repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Enablement of https://pre-commit.ci is desirable as it also
# enable auto-fixes for formatting violations. Still we still want to run
# our own GitHub action, just in case the external service becomes
# unavailable.
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: '3.11'
- name: Install pre-commit
Expand Down
23 changes: 9 additions & 14 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,19 @@
name: Node.js CI
name: 'Validate JSON Schemas'

on: [push, pull_request]

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

steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
cache: 'npm'
node-version: '18'
cache-dependency-path: src/package-lock.json
- name: npm ci
run: |
cd src
npm ci
- name: npm run build
run: |
cd src
npm run build
cache: 'npm'
cache-dependency-path: './package-lock.json'
- run: 'npm clean-install'
- run: 'npm run eslint'
- run: 'npm run check'
4 changes: 2 additions & 2 deletions .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 All @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
if: github.repository_owner == 'SchemaStore'
steps:
- uses: actions/stale@v5
- uses: actions/stale@v9
with:
stale-pr-message: 'This PR is stale because it has been open 60 days with no activity. Comment or this will be closed in 7 days.'
close-pr-message: 'This PR was closed because it has been stalled for 7 days with no activity.'
Expand Down
Loading

0 comments on commit 7ccca0f

Please sign in to comment.