Skip to content

Commit 95411d6

Browse files
committed
Resolve merge conflicts with origin/main
Conflicts in script.js and sw.js arose because this branch contains an earlier rift-mode implementation that diverged from the evolved version now on main. Resolved all conflicts in favour of main's more complete rift-mode code (TEST_MODE infrastructure, debounce timers, modal button refs, extension hooks, solvability-check throttling, cache version bump). https://claude.ai/code/session_01DXVYAJC4gFReBdx8eJqpsi
2 parents b368077 + 1cdc016 commit 95411d6

13 files changed

Lines changed: 2388 additions & 88 deletions
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: spit-the-diff
2+
3+
on:
4+
pull_request:
5+
types: [opened, synchronize, reopened, labeled]
6+
7+
jobs:
8+
spit-the-diff:
9+
runs-on: ubuntu-latest
10+
permissions:
11+
pull-requests: write
12+
13+
steps:
14+
- uses: actions/checkout@v4
15+
16+
- name: Generate PR summary
17+
uses: ssfinney/spit-the-diff@1.1.2
18+
with:
19+
format: haiku
20+
openai_api_key: ${{ secrets.OPENAI_API_KEY }}

.github/workflows/ui-tests.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: ui-tests
2+
3+
on:
4+
push:
5+
pull_request:
6+
7+
jobs:
8+
playwright:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Checkout
12+
uses: actions/checkout@v4
13+
14+
- name: Setup Node
15+
uses: actions/setup-node@v4
16+
with:
17+
node-version: 20
18+
cache: npm
19+
20+
- name: Install dependencies
21+
run: npm ci
22+
23+
- name: Install Playwright browsers
24+
run: npx playwright install --with-deps chromium
25+
26+
- name: Run UI tests
27+
run: npm run test:ui
28+
29+
- name: Upload Playwright artifacts on failure
30+
if: failure()
31+
uses: actions/upload-artifact@v4
32+
with:
33+
name: playwright-artifacts
34+
path: |
35+
playwright-report/
36+
test-results/
37+
if-no-files-found: ignore

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
node_modules/
2-
package-lock.json
2+
playwright-report/
3+
test-results/

0 commit comments

Comments
 (0)