From eebeddd74f61b5ef28dae0dacf36db16c7cb7e3f Mon Sep 17 00:00:00 2001 From: que01 Date: Wed, 21 Oct 2026 15:10:07 +0800 Subject: [PATCH] =?UTF-8?q?ci:=20=E5=A2=9E=E5=8A=A0=20PR=20=E6=B5=8F?= =?UTF-8?q?=E8=A7=88=E5=99=A8=20smoke?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../raw/completion-evidence.json | 4 +-- .gitea/workflows/ci.yml | 27 ++++++++++++++++++ apps/taro/README.md | 8 ++++++ apps/taro/package.json | 3 +- apps/taro/playwright.smoke.config.ts | 28 +++++++++++++++++++ docs/ci.md | 3 +- docs/runner-setup.md | 2 +- package.json | 3 +- 8 files changed, 72 insertions(+), 6 deletions(-) create mode 100644 apps/taro/playwright.smoke.config.ts diff --git a/.codex-tasks/template-audit-execution/raw/completion-evidence.json b/.codex-tasks/template-audit-execution/raw/completion-evidence.json index 5f4ba0a..6f2207a 100644 --- a/.codex-tasks/template-audit-execution/raw/completion-evidence.json +++ b/.codex-tasks/template-audit-execution/raw/completion-evidence.json @@ -1,7 +1,7 @@ { "schemaVersion": 1, "scope": "模板完成证据登记,保留命令、日志与产物哈希", - "generatedAt": "2026-10-21T06:43:20.332Z", + "generatedAt": "2026-10-21T07:10:10.804Z", "templates": { "acheng-campus-food": { "real-manifest-interaction": { @@ -256,5 +256,5 @@ } } }, - "sourceTreeHash": "3cd6b07396aadee64357dfd4fa865d8e62e86ed513d20264b9fb9a9622fcdcf2" + "sourceTreeHash": "f1424a4d8df41f81bcf5b7e617c5f27295d3b5841be9ad0acd5f4d1ab018e214" } diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 6b81822..508468a 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -61,6 +61,33 @@ jobs: - run: pnpm build:admin:preview - run: pnpm validate:template-release + browser-smoke: + name: Browser smoke + # 只在 PR 和手动触发时运行,避免 main 合并后重复消耗共享生产 runner。 + if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' + runs-on: ubuntu-latest + timeout-minutes: 30 + needs: [static] + steps: + - uses: actions/checkout@v4 + - uses: pnpm/action-setup@v4 + with: + version: ${{ env.PNPM_VERSION }} + - uses: actions/setup-node@v4 + with: + node-version: ${{ env.NODE_VERSION }} + cache: pnpm + - run: pnpm install --frozen-lockfile + - name: Cache Playwright browsers + uses: actions/cache@v4 + with: + path: ~/.cache/ms-playwright + key: playwright-${{ runner.os }}-${{ hashFiles('pnpm-lock.yaml') }} + - name: Install Chromium + run: pnpm --filter @personal-brand/taro exec playwright install --with-deps chromium + - name: Run PR browser smoke + run: pnpm test:browser:smoke + api: name: API integration runs-on: ubuntu-latest diff --git a/apps/taro/README.md b/apps/taro/README.md index 4af45f7..2261826 100644 --- a/apps/taro/README.md +++ b/apps/taro/README.md @@ -63,6 +63,14 @@ pnpm --filter @personal-brand/taro test:browser 浏览器测试需要先启动 API 和餐饮 H5 预览。`PREVIEW_URL` 指定预览地址,`CHROMIUM_PATH` 指定本机 Chromium;测试只读取开发库,模拟错误响应用于失败路径,不写入真实数据。 +PR 和本地可用轻量 smoke 验证 Admin 会话与创建品牌流程: + +```sh +pnpm test:browser:smoke +``` + +该命令会自动构建 Admin 并启动静态预览;完整浏览器回归仍使用 `pnpm --filter @personal-brand/taro test:browser`。 + ## 回滚与切换 所有工作在 feat/taro-template-preview 独立 worktree。用户确认前不合并、不切换主工作区、不修改开发数据库或原 dist/miniapp。确认后另行切换默认构建;旧 template:dev 始终可用。 diff --git a/apps/taro/package.json b/apps/taro/package.json index 9df5d7b..d19f7e7 100644 --- a/apps/taro/package.json +++ b/apps/taro/package.json @@ -11,7 +11,8 @@ "typecheck": "tsc --noEmit", "lint": "pnpm --workspace-root exec eslint apps/taro/src apps/taro/config \"packages/template-*/taro/**/*.{ts,tsx}\"", "test": "node --experimental-strip-types --test test/*.test.mjs", - "test:browser": "playwright test" + "test:browser": "playwright test", + "test:browser:smoke": "playwright test -c playwright.smoke.config.ts" }, "dependencies": { "@personal-brand/types": "workspace:*", diff --git a/apps/taro/playwright.smoke.config.ts b/apps/taro/playwright.smoke.config.ts new file mode 100644 index 0000000..a937a3d --- /dev/null +++ b/apps/taro/playwright.smoke.config.ts @@ -0,0 +1,28 @@ +import { defineConfig } from "@playwright/test"; + +const adminOrigin = process.env.ADMIN_URL || "http://127.0.0.1:3005"; + +export default defineConfig({ + testDir: "./test/browser", + // PR smoke 只覆盖最容易影响所有后台操作的会话与品牌创建流程。 + testMatch: ["admin-session.spec.ts", "brand-creation-and-page-scheme.spec.ts"], + timeout: 30000, + fullyParallel: false, + workers: 1, + use: { + viewport: { width: 1440, height: 1000 }, + screenshot: "only-on-failure", + trace: "retain-on-failure", + launchOptions: { args: ["--no-sandbox"] }, + }, + reporter: [["list"]], + outputDir: "../../.codex-tasks/browser-smoke/raw", + webServer: { + // 使用已构建的 Admin 静态产物,避免在 CI 中额外启动 API 或 Vite 开发代理。 + command: + "pnpm --dir ../../apps/admin exec vite preview --host 127.0.0.1 --port 3005 --strictPort", + url: `${adminOrigin}/admin/brands/new`, + reuseExistingServer: !process.env.CI, + timeout: 60000, + }, +}); diff --git a/docs/ci.md b/docs/ci.md index 9f966aa..9776528 100644 --- a/docs/ci.md +++ b/docs/ci.md @@ -24,8 +24,9 @@ ssh oracle_arm 'journalctl --user -u gitea-runner -n 100 --no-pager' - `static`:格式、lint、typecheck、模板检查、路由与模板 preview 覆盖 - `build`:生产构建、Admin preview 构建、模板 release 校验 - `api`:PostgreSQL service container 上的 API integration +- `browser-smoke`:PR 和手动触发时执行会话恢复、创建品牌与页面方案 smoke;只在 PR 和 `workflow_dispatch` 运行,main 合并后不重复执行 -浏览器回归仍作为发布前本地门禁执行,避免在 2 核生产主机上运行 Playwright 抢占资源。 +完整浏览器回归仍作为发布前本地门禁执行,避免在 2 核生产主机上运行完整 Playwright 套件抢占资源。PR smoke 只跑两条关键流程,并使用已构建的 Admin 静态产物与 mocked API。 ## 注意 diff --git a/docs/runner-setup.md b/docs/runner-setup.md index ebf5f45..71eedf8 100644 --- a/docs/runner-setup.md +++ b/docs/runner-setup.md @@ -57,4 +57,4 @@ du -sh ~/gitea-runner/cache-data - `capacity: 1`:不要提高并发,2 核主机上并发只会让生产和 CI 一起变慢。 - 日志级别保持 `debug`:`info` 级别不记录各 step 的结果行,排障时等于没有日志。 -- 浏览器回归不进 CI(见 `docs/ci.md`),因为 Playwright 会长期占用 CPU。 +- 完整浏览器回归不进入定时或 main 推送 CI;PR 只运行轻量 browser smoke(见 `docs/ci.md`),完整套件仍在发布前执行。 diff --git a/package.json b/package.json index e29e732..04390f7 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,8 @@ "check:local-media": "node scripts/check-local-media.mjs", "test:template-doctor": "node --test scripts/test/template-doctor.test.mjs", "build:taro:atelier": "TEMPLATE_KEY=atelier-solopreneur pnpm --filter @personal-brand/taro build:h5 && TEMPLATE_KEY=atelier-solopreneur pnpm --filter @personal-brand/taro build:weapp", - "build:taro:all": "pnpm build:taro:food && pnpm build:taro:linjing && pnpm build:taro:atelier" + "build:taro:all": "pnpm build:taro:food && pnpm build:taro:linjing && pnpm build:taro:atelier", + "test:browser:smoke": "pnpm --filter @personal-brand/admin build && pnpm --filter @personal-brand/taro test:browser:smoke" }, "devDependencies": { "@eslint/js": "^9.17.0",