Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into remove-screenshots
Browse files Browse the repository at this point in the history
  • Loading branch information
alexfauquette committed Jun 16, 2023
2 parents a70b1e4 + 0d4390e commit 67df549
Show file tree
Hide file tree
Showing 384 changed files with 12,043 additions and 7,194 deletions.
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ defaults: &defaults
REACT_DIST_TAG: << parameters.react-dist-tag >>
working_directory: /tmp/mui
docker:
- image: cimg/node:14.21
- image: cimg/node:18.16
# 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 @@ -260,9 +260,9 @@ jobs:
- run:
name: Run visual regression tests
command: xvfb-run yarn test:regressions
# - run:
# name: Upload screenshots to Argos CI
# command: yarn test:argos
- run:
name: Upload screenshots to Argos CI
command: yarn test:argos
test_performance:
<<: *defaults
docker:
Expand Down
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": "14",
"node": "18",
"packages": [
"packages/x-license-pro",
"packages/grid/x-data-grid",
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/l10n.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ jobs:
steps:
- run: echo "${{ github.actor }}"
- uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
- name: Use Node.js 14.x
- name: Use Node.js 18.x
uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
with:
node-version: 14
node-version: 18
cache: 'yarn' # https://github.com/actions/setup-node/blob/main/docs/advanced-usage.md#caching-packages-dependencies
- run: yarn install
env:
Expand Down
Loading

0 comments on commit 67df549

Please sign in to comment.