Skip to content

Commit 6e52d51

Browse files
Copilotjbampton
andauthored
Merge main into copilot/analyze-test-coverage, resolve conflicts
Co-authored-by: jbampton <418747+jbampton@users.noreply.github.com>
2 parents 0db4d18 + 4414d8c commit 6e52d51

27 files changed

+6720
-2257
lines changed
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# https://github.com/j178/prek
2+
name: Manual hooks
3+
4+
on: [pull_request]
5+
6+
permissions:
7+
contents: read
8+
9+
jobs:
10+
pre-commit:
11+
name: 🏃‍♂️‍➡️ prek on ${{ matrix.os }}
12+
runs-on: ${{ matrix.os }}
13+
strategy:
14+
matrix:
15+
os: [ubuntu-latest, windows-latest]
16+
steps:
17+
- name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
18+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
19+
with:
20+
persist-credentials: false
21+
- name: Run prek-action
22+
uses: j178/prek-action@53276d8b0d10f8b6672aa85b4588c6921d0370cc # v2.0.1
23+
with:
24+
install-only: true
25+
- name: Run manual prek hooks
26+
run: prek run --all-files --hook-stage manual

.github/workflows/pre-commit.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
1-
name: pre-commit
1+
# https://github.com/j178/prek
2+
name: Standard hooks
3+
4+
on: [pull_request]
25

36
permissions:
47
contents: read
58

6-
on: [pull_request]
7-
89
jobs:
910
pre-commit:
10-
name: 🏃🏼 Pre-commit on ${{ matrix.os }}
11+
name: 🏃🏿‍♂️‍➡️ Run prek on ${{ matrix.os }}
1112
runs-on: ${{ matrix.os }}
1213
strategy:
1314
matrix:
1415
os: [ubuntu-latest, windows-latest]
1516
steps:
16-
- name: Checkout Code
17+
- name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
1718
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1819
with:
19-
fetch-depth: 0
2020
persist-credentials: false
2121
- name: Run prek-action
2222
uses: j178/prek-action@53276d8b0d10f8b6672aa85b4588c6921d0370cc # v2.0.1
23+
with:
24+
extra-args: --all-files

.gitignore

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
_site
2-
.jekyll-cache
32
node_modules
43
vendor
4+
.idea
5+
.jekyll-cache
56
.venv
7+
8+
# Generated CSS (compiled from TailwindCSS)
9+
src/assets/css/tailwind.css
10+
11+
# Generated JS (bundled by esbuild)
12+
src/assets/js/phaser.bundle.js
13+
src/assets/js/bundle.js

biome.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"$schema": "https://biomejs.dev/schemas/2.3.14/schema.json",
2+
"$schema": "https://biomejs.dev/schemas/2.4.10/schema.json",
33
"files": {
4-
"includes": ["**/*.json", "**/*.njk", "**/*.yaml", "**/*.yml", "src/assets/js/**/*.js"]
4+
"includes": ["**/*.json", "**/*.njk", "**/*.yaml", "**/*.yml"]
55
},
66
"linter": {
77
"enabled": true,

0 commit comments

Comments
 (0)