fix(ci): stop skipping conflicts, and keep branches current #32

	# Golden CI floor — see dotfiles/templates/ci/README.md.
	# solon: npm + Prisma. Floor = verify (lint + typecheck) + build.
	# Lint is `next lint` (eslint + eslint-config-next, config in .eslintrc.json).
	# `next build` is hermetic: the server components that touch Prisma catch DB
	# errors and render demo fallbacks, so no live DB is needed. Prisma has no
	# postinstall, so the client is generated before typecheck/build need its types.
	# The Playwright e2e smoke tests stay deferred (need a running app).
	name: CI

	on:
	push:
	branches: [main]
	pull_request:
	branches: [main]
	workflow_dispatch:

	concurrency:
	group: ci-${{ github.ref }}
	cancel-in-progress: true

	jobs:
	verify:
	runs-on: ubuntu-latest
	timeout-minutes: 15
	env:
	DATABASE_URL: postgres://ci:ci@localhost:5432/ci
	steps:
	- uses: actions/checkout@v4

	- uses: actions/setup-node@v4
	with:
	node-version: 20
	cache: npm

	- name: Install
	run: npm ci

	- name: Prisma generate (types for typecheck)
	run: npx prisma generate

	# SSOT: lint + typecheck, defined in package.json `verify`.
	- name: Verify
	run: npm run verify

	# Build gate — hermetic (Prisma calls fall back without a live DB, see header).
	- name: Build
	run: npm run build

Navigation Menu