Skip to content

Commit

Permalink
Merge branch 'next' into add-pigment-and-base-logos
Browse files Browse the repository at this point in the history
  • Loading branch information
danilo-leal committed May 22, 2024
2 parents 0d63c74 + 55e97e2 commit 679e803
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 0 deletions.
8 changes: 8 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ commands:
node scripts/useReactVersion.mjs
# log a patch for maintainers who want to check out this change
git --no-pager diff HEAD
- when:
condition: << parameters.browsers >>
steps:
Expand All @@ -93,6 +94,13 @@ commands:
name: Restore playwright cache
keys:
- v6-playwright-{{ arch }}-{{ checksum "/tmp/playwright_info.json" }}
- when:
condition:
not: << parameters.browsers >>
steps:
# See https://stackoverflow.com/a/73411601
- run: corepack enable --install-directory ~/bin

- run:
name: View install environment
command: |
Expand Down
9 changes: 9 additions & 0 deletions docs/data/about/teamMembers.json
Original file line number Diff line number Diff line change
Expand Up @@ -306,5 +306,14 @@
"locationCountry": "fr",
"about": "Cooking 🍳, plant caring 🪴 and literature 📖",
"github": "arthurbalduini"
},
{
"name": "Kenan Yusuf",
"title": "Design Engineer - X",
"location": "London, UK",
"locationCountry": "gb",
"about": "Amateur cook, DIYer, and film photographer",
"github": "KenanYusuf",
"twitter": "KebabYusuf"
}
]
Binary file added docs/public/static/branding/about/kenan-yusuf.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,9 @@
"yargs": "^17.7.2"
},
"packageManager": "[email protected]",
"engines": {
"pnpm": "8.15.8"
},
"resolutions": {
"@babel/core": "^7.24.5",
"@babel/code-frame": "^7.24.2",
Expand Down

0 comments on commit 679e803

Please sign in to comment.