mirror of
https://github.com/Chewbaccalakis/rfid-database.git
synced 2026-09-09 16:01:56 -07:00
Nick TrochalakisandCursor Agent
5aa5fef9af
* Fix conflict markers on main and guard CI against them PR #2 merged before the Dockerfile cleanup landed, leaving <<<<<<< markers that break docker compose build. Restore clean Docker files and fail CI if conflict markers appear in the tree. * Add CI check that fails on merge conflict markers * Narrow conflict-marker CI check to <<<<<<< and >>>>>>> --------- Co-authored-by: Cursor Agent <[email protected]>
31 lines
660 B
YAML
31 lines
660 B
YAML
name: CI
|
|
|
|
on:
|
|
pull_request:
|
|
push:
|
|
branches: [main]
|
|
|
|
jobs:
|
|
check:
|
|
runs-on: ubuntu-latest
|
|
steps:
|
|
- uses: actions/checkout@v4
|
|
|
|
- name: Reject merge conflict markers
|
|
run: |
|
|
if git grep -nE '^(<<<<<<<|>>>>>>>)' -- . \
|
|
':(exclude)package-lock.json'; then
|
|
echo "::error::Merge conflict markers found in tracked files"
|
|
exit 1
|
|
fi
|
|
echo "No conflict markers found"
|
|
|
|
- uses: actions/setup-node@v4
|
|
with:
|
|
node-version: "22"
|
|
cache: "npm"
|
|
- run: npm ci
|
|
- run: npm run lint
|
|
- run: npm run typecheck
|
|
- run: npm test
|