Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
Signed-off-by: Olivier Tassinari <[email protected]>
  • Loading branch information
oliviertassinari authored Sep 24, 2024
2 parents 989c0db + d771bcf commit f011a9f
Show file tree
Hide file tree
Showing 944 changed files with 16,436 additions and 5,891 deletions.
38 changes: 36 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ default-job: &default-job
REACT_VERSION: << parameters.react-version >>
working_directory: /tmp/mui
docker:
- image: cimg/node:18.20
- image: cimg/node:20.17
# CircleCI has disabled the cache across forks for security reasons.
# Following their official statement, it was a quick solution, they
# are working on providing this feature back with appropriate security measures.
Expand Down Expand Up @@ -99,6 +99,14 @@ commands:
# log a patch for maintainers who want to check out this change
git --no-pager diff HEAD
- when:
condition:
equal: [material-ui-v6, << pipeline.parameters.workflow >>]
steps:
- run:
name: Install @mui/material@next
command: pnpm use-material-ui-v6

- when:
condition: << parameters.browsers >>
steps:
Expand Down Expand Up @@ -204,6 +212,12 @@ jobs:
- run:
name: '`pnpm l10n` changes committed?'
command: git add -A && git diff --exit-code --staged
- run:
name: Sync RSC "use client" directives
command: pnpm rsc:build
- run:
name: '`pnpm rsc:build` changes committed?'
command: git add -A && git diff --exit-code --staged
- run:
name: '`pnpm docs:link-check` changes committed?'
command: |
Expand Down Expand Up @@ -248,7 +262,7 @@ jobs:
command: pnpm docs:typescript:formatted --disable-cache
- run:
name: '`pnpm docs:typescript:formatted` changes committed?'
command: git add -A && git diff --exit-code --staged
command: git add -A && git diff --exit-code --staged docs/src docs/data
- run:
name: Tests TypeScript definitions
command: pnpm typescript:ci
Expand Down Expand Up @@ -383,3 +397,23 @@ workflows:
<<: *default-context
react-version: next
name: test_e2e-react@next

material-ui-v6:
when:
equal: [material-ui-v6, << pipeline.parameters.workflow >>]
jobs:
- test_unit:
<<: *default-context
name: test_unit-material@next
- test_browser:
<<: *default-context
name: test_browser-material@next
- test_regressions:
<<: *default-context
name: test_regressions-material@next
- test_e2e:
<<: *default-context
name: test_e2e-material@next
- test_types:
<<: *default-context
name: test_types-material@next
2 changes: 1 addition & 1 deletion .codesandbox/ci.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"buildCommand": "build:codesandbox",
"installCommand": "install:codesandbox",
"node": "18",
"node": "20",
"packages": [
"packages/x-license",
"packages/x-data-grid",
Expand Down
31 changes: 5 additions & 26 deletions .github/workflows/closed-issue-message.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Add comment
name: Add closing message to issue

on:
issues:
Expand All @@ -9,30 +9,9 @@ permissions: {}

jobs:
add-comment:
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GH_REPO: ${{ github.repository }}
NUMBER: ${{ github.event.issue.number }}
BODY: |
:warning: **This issue has been closed.** If you have a similar problem but not exactly the same, please open a [new issue](https://github.com/mui/mui-x/issues/new/choose).
Now, if you have additional information related to this issue or things that could help future readers, feel free to leave a comment.
APPENDIX: |
@${{ github.event.issue.user.login }}: How did we do? Your experience with our support team matters to us. If you have a moment, please share your thoughts in this short [Support Satisfaction survey](https://tally.so/r/w4r5Mk?issue=${{ github.event.issue.number }}&productId=x).
if: github.event.issue.state_reason != 'inactivity'
runs-on: ubuntu-latest
name: Add closing message
if: github.event.issue.state_reason == 'completed'
uses: mui/mui-public/.github/workflows/issues_add-closing-message.yml@master
permissions:
contents: read
issues: write
steps:
- uses: actions-cool/check-user-permission@956b2e73cdfe3bcb819bb7225e490cb3b18fd76e
id: checkUser
with:
require: 'write'
username: ${{ github.event.issue.user.login }}
- name: Add comment for outside contributors
if: steps.checkUser.outputs.check-result == false
run: gh issue comment "$NUMBER" --body "$BODY $APPENDIX"
- name: Add comment for maintainers
if: steps.checkUser.outputs.check-result == true
run: gh issue comment "$NUMBER" --body "$BODY"
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5
uses: github/codeql-action/init@294a9d92911152fe08befb9ec03e240add280cb3 # v3.26.8
with:
languages: typescript
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -29,4 +29,4 @@ jobs:
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5
uses: github/codeql-action/analyze@294a9d92911152fe08befb9ec03e240add280cb3 # v3.26.8
12 changes: 7 additions & 5 deletions .github/workflows/codspeed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ on:
- 'master'
- 'next'

permissions: {}

jobs:
benchmarks:
name: Benchmarks Charts
Expand All @@ -26,10 +28,10 @@ jobs:
# L3: Run the benchmarks for pull requests with the label 'component: charts'
# Yaml syntax looks a little weird, but it is correct.
if: >-
${{
(github.event_name == 'push') ||
(github.event_name == 'pull_request' && github.event.action == 'labeled' && github.event.label.name == 'component: charts') ||
(github.event_name == 'pull_request' && github.event.action != 'labeled' && contains(github.event.pull_request.labels.*.name, 'component: charts'))
${{
(github.event_name == 'push') ||
(github.event_name == 'pull_request' && github.event.action == 'labeled' && github.event.label.name == 'component: charts') ||
(github.event_name == 'pull_request' && github.event.action != 'labeled' && contains(github.event.pull_request.labels.*.name, 'component: charts'))
}}
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
Expand All @@ -43,7 +45,7 @@ jobs:
cache: 'pnpm' # https://github.com/actions/setup-node/blob/main/docs/advanced-usage.md#caching-packages-dependencies
- run: pnpm install --frozen-lockfile
# Ensure we are running on the prod version of our libs
# Only charts and license are needed for the benchmarks
- run: pnpm --filter @mui/x-internals build
- run: pnpm --filter @mui/x-license build
- run: pnpm --filter @mui/x-charts build
- run: pnpm --filter @mui/x-charts-pro build
Expand Down
35 changes: 0 additions & 35 deletions .github/workflows/issue-cleanup.yml

This file was deleted.

26 changes: 26 additions & 0 deletions .github/workflows/new-issue-triage.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: New issue triage
on:
issues:
types:
- opened

permissions: {}

jobs:
issue_cleanup:
name: Clean issue body
uses: mui/mui-public/.github/workflows/issues_body-cleanup.yml@master
permissions:
contents: read
issues: write
order_id_validation:
name: Validate order ID
needs: issue_cleanup
if: needs.issue_cleanup.outputs.orderId != ''
uses: mui/mui-public/.github/workflows/issues_order-id-validation.yml@master
secrets: inherit
with:
orderId: ${{ needs.issue_cleanup.outputs.orderId }}
permissions:
contents: read
issues: write
2 changes: 1 addition & 1 deletion .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: Upload to code-scanning
uses: github/codeql-action/upload-sarif@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5
uses: github/codeql-action/upload-sarif@294a9d92911152fe08befb9ec03e240add280cb3 # v3.26.8
with:
sarif_file: results.sarif
10 changes: 6 additions & 4 deletions .github/workflows/vale-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,12 @@ jobs:
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- uses: errata-ai/vale-action@38bf078c328061f59879b347ca344a718a736018 # v2.1.0
continue-on-error: true # GitHub Action flag needed until https://github.com/errata-ai/vale-action/issues/89 is fixed
with:
reporter: github-pr-review
files: docs/data
env:
# Errors should be more visible
fail_on_error: true
# The other reports don't work, not really https://github.com/reviewdog/reviewdog#reporters
reporter: github-pr-check
# Required, set by GitHub actions automatically:
# https://docs.github.com/en/actions/security-guides/automatic-token-authentication#about-the-github_token-secret
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
token: ${{secrets.GITHUB_TOKEN}}
2 changes: 1 addition & 1 deletion .vale.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Vale config. More information at https://vale.sh/docs/topics/config/
StylesPath = .github/styles
MinAlertLevel = error
MinAlertLevel = warning

# To update mui-vale package:
# 1. Go to the docs folder in the material-ui repo
Expand Down
Loading

0 comments on commit f011a9f

Please sign in to comment.