Skip to content

Commit

Permalink
Merge branch 'main' into style-guide
Browse files Browse the repository at this point in the history
  • Loading branch information
Emily Riehl authored Oct 23, 2023
2 parents a2fbdd7 + ca85956 commit 1fbba3b
Show file tree
Hide file tree
Showing 20 changed files with 3,481 additions and 1,165 deletions.
22 changes: 7 additions & 15 deletions .github/workflows/format.yml
Original file line number Diff line number Diff line change
@@ -1,30 +1,22 @@
name: Code autoformatting
name: File formatting

on:
push:
branches:
- main
pull_request:
branches:
- main

jobs:
format:
runs-on: ubuntu-latest
permissions:
contents: write
steps:
- name: Checkout code
uses: actions/checkout@v3
with:
# Make sure the actual branch is checked out when running on pull requests
ref: ${{ github.head_ref }}
# This is important to fetch the changes to the previous commit
fetch-depth: 0

- name: Run Prettier
- name: Prettier
uses: creyD/[email protected]
with:
prettier_options: --write **/*.{md,json,yaml,yml}
commit_options: --allow-empty
# Update the current commit instead of creating a new one. Only works if checkout fetch depth is set to `0`
same_commit: true
# Prettify changed files. Only works if checkout fetch depth is set to `0`
only_changed: true
dry: true
prettier_options: --check **/*.{md,json,yaml,yml}
8 changes: 4 additions & 4 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"recommendations": [
"nikolaikudasovfizruk.rzk-1-experimental-highlighting",
"esbenp.prettier-vscode"
]
"recommendations": [
"nikolaikudasovfizruk.rzk-1-experimental-highlighting",
"esbenp.prettier-vscode"
]
}
2 changes: 2 additions & 0 deletions src/CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@ Formalizations were contributed by the following people (listed alphabetically):
- [Fredrik Bakke](https://github.com/fredrik-bakke),
- [César Bardomiano Martínez](https://github.com/cesarbm03),
- [Jonathan Campbell](https://github.com/jonalfcam),
- [Aras Ergus](https://www.aergus.net/),
- [Matthias Hutzler](https://github.com/MatthiasHu),
- [Nikolai Kudasov](https://fizruk.github.io/),
- [Kenji Maillard](https://github.com/kyoDralliam),
- [David Martínez Carpena](https://dvmcarpena.com/),
- [Stiéphen Pradal](https://stiephenpradal.github.io/),
- [Nima Rasekh](https://guests.mpim-bonn.mpg.de/rasekh/),
- [Emily Riehl](https://emilyriehl.github.io/),
- [Florrie Verity](https://github.com/floverity),
Expand Down
Loading

0 comments on commit 1fbba3b

Please sign in to comment.