Skip to content

Commit

Permalink
Merge branch 'mdn:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
catfishcrawler committed Jan 8, 2024
2 parents 06c23f5 + f2a3549 commit 104b6a9
Show file tree
Hide file tree
Showing 11,496 changed files with 179,076 additions and 104,417 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
8 changes: 4 additions & 4 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
/.github/ @mdn/core-dev
/* @mdn/core-dev
/*.md @mdn/core-yari-content
# These are @schalkneethling because the auto-merge GHA workflow uses my PAT and will assign me.
# If we add another reviewer, the auto-merge will cease to be automatic.
/package.json @schalkneethling
/yarn.lock @schalkneethling
# These are @mdn-bot because the auto-merge GHA workflow uses the PAT of this account.
# If another reviewer is specified, update the PAT token or auto-merge will cease to be automatic.
/package.json @mdn-bot
/yarn.lock @mdn-bot
16 changes: 16 additions & 0 deletions .github/issue-regex-labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,14 @@ Content:CSS:
- '\/docs\/Web\/CSS'
Content:Events:
- '\/docs\/Web\/Events'
Content:Firefox:
- '\/docs\/Mozilla/Firefox'
Content:Games:
- '\/docs\/Games'
Content:Glossary:
- '\/docs\/Glossary'
Content:Guide:
- '\/docs\/Web/Guide'
Content:HTML:
- '\/docs\/Web\/HTML'
Content:HTTP:
Expand All @@ -24,6 +30,8 @@ Content:Learn:CSS:
- '\/docs\/Learn\/CSS'
Content:Learn:Django:
- '\/docs\/Learn\/Server-side\/Django'
Content:Learn:Express:
- '\/docs\/Learn\/Server-side\/Express_Nodejs'
Content:Learn:Forms:
- '\/docs\/Learn\/Forms'
Content:Learn:GitHub:
Expand All @@ -34,8 +42,16 @@ Content:Learn:JavaScript:
- '\/docs\/Learn\/JavaScript'
Content:Manifest:
- '\/docs\/Web\/Manifest'
Content:MathML:
- '\/docs\/Web\/MathML'
Content:Media:
- '\/docs\/Web\/Media'
Content:Meta:
- '\/docs\/MDN'
Content:Performance:
- '\/docs\/Web\/Performance'
Content:PWA:
- '\/docs\/Web\/Progressive_web_apps'
Content:Security:
- '\/docs\/Web\/Security'
Content:SVG:
Expand Down
88 changes: 71 additions & 17 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,85 @@
system:
- package.json
- yarn.lock
- .github/**/*
- .husky/**/*
- .vscode/**/*
- .*
- scripts/**/*
- tests/**/*
- jest.config.json
- front-matter-config.json

Content:Accessibility:
- files/en-us/web/accessibility/**/*
Content:CSS:
- files/en-us/web/css/**/*
Content:DevTools:
- files/en-us/tools/**/*
Content:Events:
- files/en-us/web/events/**/*
Content:Firefox:
- files/en-us/mozilla/firefox/**/*
Content:Games:
- files/en-us/games/**/*
Content:Glossary:
- files/en-us/glossary/**/*
Content:Guide:
- files/en-us/web/guide/**/*
Content:HTML:
- files/en-us/web/html/**/*
Content:HTTP:
- files/en-us/web/http/**/*
Content:JS:
- files/en-us/web/javascript/**/*
Content:Learn:
- any:
- files/en-us/learn/**/*
- "!files/en-us/learn/accessibility/**/*"
- "!files/en-us/learn/tools_and_testing/client-side_javascript_frameworks/**/*"
- "!files/en-us/learn/tools_and_testing/understanding_client-side_tools/**/*"
- "!files/en-us/learn/tools_and_testing/cross_browser_testing/**/*"
- "!files/en-us/learn/css/**/*"
- "!files/en-us/learn/server-side/django/**/*"
- "!files/en-us/learn/server-side/express_nodejs/**/*"
- "!files/en-us/learn/forms/**/*"
- "!files/en-us/learn/tools_and_testing/github/**/*"
- "!files/en-us/learn/html/**/*"
- "!files/en-us/learn/javascript/**/*"
- files/en-us/web/tutorials/**/*
Content:Learn:Accessibility:
- files/en-us/learn/accessibility/**/*
Content:Learn:Client-side:
- files/en-us/learn/tools_and_testing/client-side_javascript_frameworks/**/*
- files/en-us/learn/tools_and_testing/understanding_client-side_tools/**/*
Content:Learn:Cross-Browser-Testing:
- files/en-us/learn/tools_and_testing/cross_browser_testing/**/*
Content:Learn:CSS:
- files/en-us/learn/css/**/*
Content:Learn:Django:
- files/en-us/learn/server-side/django/**/*
Content:Learn:Express:
- files/en-us/learn/server-side/express_nodejs/**/*
Content:Learn:Forms:
- files/en-us/learn/forms/**/*
Content:Learn:GitHub:
- files/en-us/learn/tools_and_testing/github/**/*
Content:Learn:HTML:
- files/en-us/learn/html/**/*
Content:Learn:JavaScript:
- files/en-us/learn/javascript/**/*
Content:Manifest:
- files/en-us/web/manifest/**/*
Content:MathML:
- files/en-us/web/mathml/**/*
Content:Media:
- files/en-us/web/media/**/*
Content:Meta:
- files/en-us/mdn/**/*
Content:Performance:
- files/en-us/web/performance/**/*
Content:PWA:
- files/en-us/web/progressive_web_apps/**/*
Content:Security:
- files/en-us/web/security/**/*
Content:SVG:
- files/en-us/web/svg/**/*
Content:wasm:
Expand All @@ -26,27 +90,17 @@ Content:WebDriver:
- files/en-us/web/webdriver/**/*
Content:WebExt:
- files/en-us/mozilla/add-ons/webextensions/**/*
Content:Learn:
- files/en-us/learn/**/*
- files/en-us/web/guide/**/*
- files/en-us/web/tutorials/**/*
Content:Other:
- files/en-us/games/**/*
- files/en-us/mdn/**/*
- files/en-us/mozilla/**/*
- files/en-us/plugins/**/*
- any:
- files/en-us/mozilla/**/*
- "!files/en-us/mozilla/add-ons/webextensions/**/*"
- "!files/en-us/mozilla/firefox/**/*"
- files/en-us/related/**/*
- files/en-us/tools/**/*
- files/en-us/web/demos/**/*
- files/en-us/web/events/**/*
- files/en-us/web/exslt/**/*
- files/en-us/web/manifest/**/*
- files/en-us/web/opensearch/**/*
- files/en-us/web/performance/**/*
- files/en-us/web/privacy/**/*
- files/en-us/web/progressive_web_apps/**/*
- files/en-us/web/security/**/*
- files/en-us/web/web_components/**/*
- files/en-us/web/text_fragments/**/*
- files/en-us/web/xml/**/*
- files/en-us/web/xpath/**/*
- files/en-us/web/xslt/**/*
58 changes: 58 additions & 0 deletions .github/workflows/auto-cleanup-bot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: Create content auto-fix PR

on:
schedule:
- cron: "0 0 * * *"
workflow_dispatch:

jobs:
fix:
if: github.repository == 'mdn/content'
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Setup Node.js environment
uses: actions/setup-node@v4
with:
node-version-file: ".nvmrc"
cache: yarn

- name: Install all yarn packages
run: yarn --frozen-lockfile
env:
# https://github.com/microsoft/vscode-ripgrep#github-api-limit-note
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
HUSKY: 0

- name: Lint markdown files
run: |
yarn content fix-flaws
yarn fix:md
yarn fix:fm
- name: Create PR with only fixable issues
if: success()
uses: peter-evans/create-pull-request@v5
with:
commit-message: "chore: auto-fix Markdownlint, Prettier, and front-matter issues"
branch: markdownlint-auto-cleanup
title: "fix: auto-cleanup by bot"
author: mdn-bot <[email protected]>
body: |
All issues auto-fixed
token: ${{ secrets.AUTOMERGE_TOKEN }}

- name: Create PR with notice on unfixed issues
if: failure()
uses: peter-evans/create-pull-request@v5
with:
commit-message: "chore: auto-fix Markdownlint, Prettier, and front-matter issues"
branch: markdownlint-auto-cleanup
title: "fix: auto-cleanup by bot"
author: mdn-bot <[email protected]>
body: |
Auto-fix was run, but additional issues found.
Please review the run log: https://github.com/mdn/content/actions/runs/${{ github.run_id }}
token: ${{ secrets.AUTOMERGE_TOKEN }}
16 changes: 8 additions & 8 deletions .github/workflows/interfacedata-updater.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Setup node.js
uses: actions/setup-node@v3
with:
node-version-file: ".nvmrc"

- name: Checkout content
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: mdn-content
ref: main

- name: Setup node.js
uses: actions/setup-node@v4
with:
node-version-file: "mdn-content/.nvmrc"

- name: Checkout webref
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: w3c/webref
path: webref
Expand All @@ -35,7 +35,7 @@ jobs:
run: node scripts/update-interface-data.js ../webref/

- name: Create pull request
uses: peter-evans/create-pull-request@v4
uses: peter-evans/create-pull-request@v5
with:
path: mdn-content
token: ${{ secrets.AUTOMERGE_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/issue-regex-labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
issue-labeler:
runs-on: ubuntu-latest
steps:
- uses: github/issue-labeler@v3.0
- uses: github/issue-labeler@v3.3
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
configuration-path: .github/issue-regex-labeler.yml
Expand Down
53 changes: 0 additions & 53 deletions .github/workflows/markdown-lint-fix.yml

This file was deleted.

9 changes: 7 additions & 2 deletions .github/workflows/markdown-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
paths:
- .markdownlint-cli2.jsonc
- .nvmrc
- .prettier*
- package.json
- yarn.lock
- .github/workflows/markdown-lint.yml
Expand All @@ -17,18 +18,22 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup Node.js environment
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: ".nvmrc"
cache: yarn

- name: Install all yarn packages
run: yarn --frozen-lockfile
env:
# https://github.com/microsoft/vscode-ripgrep#github-api-limit-note
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Lint markdown files
run: |
echo "::add-matcher::.github/workflows/markdownlint-problem-matcher.json"
yarn lint:md
yarn lint:fm
Loading

0 comments on commit 104b6a9

Please sign in to comment.