Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
12a3bf2f3b | ||
|
|
ca6d1712bd | ||
|
|
e7ef0b3ce5 | ||
|
|
b82aa12875 | ||
|
|
b43b6f2785 | ||
|
|
965dd10219 | ||
|
|
371689484e |
No files matched your search
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"schemaVersion": 1,
|
||||
"scope": "模板完成证据登记,保留命令、日志与产物哈希",
|
||||
"generatedAt": "2026-10-23T06:35:59.337Z",
|
||||
"generatedAt": "2026-10-23T07:40:54.556Z",
|
||||
"templates": {
|
||||
"acheng-campus-food": {
|
||||
"real-manifest-interaction": {
|
||||
@@ -256,5 +256,5 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"sourceTreeHash": "f39e31a1959e24c07bf60776a0d3c5f28e5745962ca004301ff304daa1430041"
|
||||
"sourceTreeHash": "f0bb03d734cf303b75be41bbcab6eea15f5479ac197b16c82f78e1faad71b17e"
|
||||
}
|
||||
+23
-9
@@ -3,7 +3,7 @@ name: CI
|
||||
on:
|
||||
push:
|
||||
branches: [main]
|
||||
# 纯文档提交不消耗 2 核 runner;需要状态时用 workflow_dispatch 手动触发。
|
||||
# 纯文档提交不占用 runner;需要状态时用 workflow_dispatch 手动触发。
|
||||
paths-ignore:
|
||||
- "**.md"
|
||||
# PR 不设置 paths-ignore:branch protection 的 required checks 必须始终上报,
|
||||
@@ -18,6 +18,8 @@ concurrency:
|
||||
env:
|
||||
NODE_VERSION: "24"
|
||||
PNPM_VERSION: "9.15.0"
|
||||
# runner 任务容器把该路径 bind mount 到宿主机共享 store,避免每个 job 重复下载依赖。
|
||||
npm_config_store_dir: /workspace/.pnpm-store
|
||||
|
||||
jobs:
|
||||
static:
|
||||
@@ -32,10 +34,18 @@ jobs:
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: ${{ env.NODE_VERSION }}
|
||||
cache: pnpm
|
||||
- name: Restore Turbo cache
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: .turbo/cache
|
||||
key: turbo-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('pnpm-lock.yaml') }}-${{ github.sha }}
|
||||
restore-keys: |
|
||||
turbo-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('pnpm-lock.yaml') }}-
|
||||
turbo-${{ runner.os }}-${{ runner.arch }}-
|
||||
- run: pnpm install --frozen-lockfile
|
||||
- run: pnpm check
|
||||
- run: pnpm test:api-routes
|
||||
- run: pnpm test:deploy
|
||||
- run: pnpm validate:templates
|
||||
- run: pnpm template:compatibility
|
||||
- run: pnpm --filter @personal-brand/api exec tsx --test test/template-preview-matrix.test.ts
|
||||
@@ -55,7 +65,14 @@ jobs:
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: ${{ env.NODE_VERSION }}
|
||||
cache: pnpm
|
||||
- name: Restore Turbo cache
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: .turbo/cache
|
||||
key: turbo-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('pnpm-lock.yaml') }}-${{ github.sha }}
|
||||
restore-keys: |
|
||||
turbo-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('pnpm-lock.yaml') }}-
|
||||
turbo-${{ runner.os }}-${{ runner.arch }}-
|
||||
- run: pnpm install --frozen-lockfile
|
||||
- run: pnpm build
|
||||
- run: pnpm build:admin:preview
|
||||
@@ -67,7 +84,6 @@ jobs:
|
||||
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
|
||||
@@ -76,15 +92,15 @@ jobs:
|
||||
- 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') }}
|
||||
key: playwright-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('pnpm-lock.yaml') }}
|
||||
- name: Install Chromium
|
||||
run: pnpm --filter @personal-brand/taro exec playwright install --with-deps chromium
|
||||
# 系统依赖与同版本 Chromium 已预装在 personal-brand-ci:node24 中;这里只做版本兜底。
|
||||
run: pnpm --filter @personal-brand/taro exec playwright install chromium
|
||||
- name: Run PR browser smoke
|
||||
run: pnpm test:browser:smoke
|
||||
|
||||
@@ -92,7 +108,6 @@ jobs:
|
||||
name: API integration
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 45
|
||||
needs: [static]
|
||||
services:
|
||||
postgres:
|
||||
image: postgres:16-alpine
|
||||
@@ -118,7 +133,6 @@ jobs:
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: ${{ env.NODE_VERSION }}
|
||||
cache: pnpm
|
||||
- run: pnpm install --frozen-lockfile
|
||||
- name: Prepare API test env
|
||||
working-directory: apps/api
|
||||
|
||||
+6
-1
@@ -18,7 +18,12 @@ RUN pnpm --filter @personal-brand/config build
|
||||
RUN pnpm --filter @personal-brand/types build
|
||||
RUN pnpm --filter @personal-brand/validation build
|
||||
RUN pnpm --filter @personal-brand/api-client build
|
||||
RUN pnpm add -w @tarojs/binding-linux-arm64-gnu@4.3.0
|
||||
ARG TARGETARCH
|
||||
RUN case "${TARGETARCH:-$(uname -m)}" in \
|
||||
arm64 | aarch64) pnpm add -w @tarojs/binding-linux-arm64-gnu@4.3.0 ;; \
|
||||
amd64 | x86_64) pnpm add -w @tarojs/binding-linux-x64-gnu@4.3.0 ;; \
|
||||
*) echo "unsupported TARGETARCH: ${TARGETARCH:-$(uname -m)}" >&2; exit 1 ;; \
|
||||
esac
|
||||
RUN pnpm build:admin:preview
|
||||
|
||||
FROM alpine:latest AS runtime
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
# 本地 CI 任务容器基础镜像:Node 24 + pnpm + Playwright 运行依赖。
|
||||
# 构建(在仓库根目录执行):
|
||||
# docker build -f deploy/runner/Dockerfile -t personal-brand-ci:node24 .
|
||||
# Playwright 版本需与 apps/taro/package.json 保持一致;升级 Playwright 后重建本镜像。
|
||||
FROM node:24-bookworm
|
||||
|
||||
ARG PNPM_VERSION=9.15.0
|
||||
ARG PLAYWRIGHT_VERSION=1.58.2
|
||||
|
||||
ENV PNPM_HOME=/usr/local/share/pnpm
|
||||
ENV PATH=${PNPM_HOME}:${PATH}
|
||||
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y --no-install-recommends jq unzip \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
RUN corepack enable \
|
||||
&& corepack prepare pnpm@${PNPM_VERSION} --activate \
|
||||
&& pnpm --version
|
||||
|
||||
# 预装 Chromium 的系统依赖和浏览器本体,避免每个 job 重复执行 apt 与下载。
|
||||
RUN npx --yes playwright@${PLAYWRIGHT_VERSION} install --with-deps chromium \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
WORKDIR /workspace
|
||||
@@ -10,22 +10,32 @@
|
||||
# RUNNER_TOKEN 仓库 Settings → Actions → Runners 里生成的注册 token
|
||||
# 可选:
|
||||
# RUNNER_NAME runner 名称,默认取 hostname
|
||||
# RUNNER_LABELS 默认 ubuntu-latest,oracle-arm
|
||||
# RUNNER_LABELS 默认 ubuntu-latest
|
||||
# RUNNER_VERSION 默认 5.2.0
|
||||
# RUNNER_ROOT 默认 $HOME/gitea-runner
|
||||
# RUNNER_CAPACITY 默认 1,按 runner 主机资源设置并发数
|
||||
# RUNNER_CONTAINER_OPTIONS 默认 "--cpus=1.5 --memory=4g"
|
||||
# RUNNER_PNPM_STORE 宿主机 pnpm store 目录,默认 $RUNNER_ROOT/pnpm-store
|
||||
# RUNNER_IMAGE 任务容器镜像,默认 node:24-bookworm;本地预构建镜像可传 personal-brand-ci:node24
|
||||
# CACHE_PORT 默认 8193
|
||||
# RUNNER_CACHE_HOST 默认 172.17.0.1(Docker 默认 bridge 网关)
|
||||
# SKIP_LINGER 默认 0;设为 1 时不尝试用 sudo 开启 linger
|
||||
set -euo pipefail
|
||||
|
||||
GITEA_URL=${GITEA_URL:?需要设置 GITEA_URL}
|
||||
RUNNER_TOKEN=${RUNNER_TOKEN:?需要设置 RUNNER_TOKEN}
|
||||
RUNNER_NAME=${RUNNER_NAME:-$(hostname -s)}
|
||||
RUNNER_LABELS=${RUNNER_LABELS:-ubuntu-latest,oracle-arm}
|
||||
RUNNER_LABELS=${RUNNER_LABELS:-ubuntu-latest}
|
||||
RUNNER_VERSION=${RUNNER_VERSION:-5.2.0}
|
||||
RUNNER_ROOT=${RUNNER_ROOT:-$HOME/gitea-runner}
|
||||
RUNNER_CAPACITY=${RUNNER_CAPACITY:-1}
|
||||
RUNNER_CONTAINER_OPTIONS=${RUNNER_CONTAINER_OPTIONS:-"--cpus=1.5 --memory=4g"}
|
||||
RUNNER_PNPM_STORE=${RUNNER_PNPM_STORE:-$RUNNER_ROOT/pnpm-store}
|
||||
RUNNER_IMAGE=${RUNNER_IMAGE:-node:24-bookworm}
|
||||
CACHE_PORT=${CACHE_PORT:-8193}
|
||||
RUNNER_CACHE_HOST=${RUNNER_CACHE_HOST:-172.17.0.1}
|
||||
CACHE_DIR=${CACHE_DIR:-$RUNNER_ROOT/cache-data}
|
||||
SKIP_LINGER=${SKIP_LINGER:-0}
|
||||
DRY_RUN=${DRY_RUN:-0}
|
||||
|
||||
if [ "$DRY_RUN" != "1" ]; then
|
||||
@@ -50,22 +60,33 @@ run() {
|
||||
archive="gitea-runner-${RUNNER_VERSION}-linux-${ARCH}.xz"
|
||||
base="https://dl.gitea.com/gitea-runner/${RUNNER_VERSION}"
|
||||
|
||||
run mkdir -p "$RUNNER_ROOT" "$CACHE_DIR"
|
||||
run mkdir -p "$RUNNER_ROOT" "$CACHE_DIR" "$RUNNER_PNPM_STORE"
|
||||
if [ ! -x "$RUNNER_ROOT/gitea-runner-${RUNNER_VERSION}-linux-${ARCH}" ]; then
|
||||
run curl -fsSL -o "$RUNNER_ROOT/$archive" "$base/$archive"
|
||||
run curl -fsSL -o "$RUNNER_ROOT/$archive.sha256" "$base/$archive.sha256"
|
||||
run env -C "$RUNNER_ROOT" sha256sum -c "$archive.sha256"
|
||||
run xz -d -f "$RUNNER_ROOT/$archive"
|
||||
fi
|
||||
run chmod +x "$RUNNER_ROOT/gitea-runner-${RUNNER_VERSION}-linux-${ARCH}"
|
||||
|
||||
# 把 pnpm store 挂到所有任务容器的固定路径;workflow 通过 npm_config_store_dir 指向它。
|
||||
case " $RUNNER_CONTAINER_OPTIONS " in
|
||||
*"/workspace/.pnpm-store"*) ;;
|
||||
*) RUNNER_CONTAINER_OPTIONS="$RUNNER_CONTAINER_OPTIONS --volume=${RUNNER_PNPM_STORE}:/workspace/.pnpm-store" ;;
|
||||
esac
|
||||
run ln -sf "gitea-runner-${RUNNER_VERSION}-linux-${ARCH}" "$RUNNER_ROOT/gitea-runner"
|
||||
|
||||
label_specs() {
|
||||
printf '%s\n' "$RUNNER_LABELS" | tr ',' '\n' | sed "s|^\(.*\)$|\1:docker://${RUNNER_IMAGE}|"
|
||||
}
|
||||
|
||||
if [ ! -f "$RUNNER_ROOT/.runner" ]; then
|
||||
run env -C "$RUNNER_ROOT" ./gitea-runner register \
|
||||
--no-interactive \
|
||||
--instance "$GITEA_URL" \
|
||||
--token "$RUNNER_TOKEN" \
|
||||
--name "$RUNNER_NAME" \
|
||||
--labels "$RUNNER_LABELS"
|
||||
--labels "$(label_specs | paste -sd, -)"
|
||||
fi
|
||||
if [ -f "$RUNNER_ROOT/.runner" ]; then
|
||||
run chmod 600 "$RUNNER_ROOT/.runner"
|
||||
@@ -76,20 +97,21 @@ log:
|
||||
level: debug
|
||||
runner:
|
||||
file: .runner
|
||||
capacity: 1
|
||||
capacity: ${RUNNER_CAPACITY}
|
||||
timeout: 2h
|
||||
fetch_timeout: 10s
|
||||
fetch_interval: 2s
|
||||
labels:
|
||||
$(printf '%s\n' "$RUNNER_LABELS" | tr ',' '\n' | sed 's|^\(.*\)$| - "\1:docker://node:24-bookworm"|')
|
||||
$(label_specs | sed 's|^| - "|; s|$|"|')
|
||||
cache:
|
||||
enabled: true
|
||||
dir: ${CACHE_DIR}
|
||||
host: ${RUNNER_CACHE_HOST}
|
||||
port: ${CACHE_PORT}
|
||||
container:
|
||||
options: "--cpus=1.5 --memory=4g"
|
||||
valid_volumes: []
|
||||
options: "${RUNNER_CONTAINER_OPTIONS}"
|
||||
valid_volumes:
|
||||
- ${RUNNER_PNPM_STORE}
|
||||
docker_host: "-"
|
||||
CONFIG
|
||||
|
||||
@@ -111,9 +133,12 @@ WantedBy=default.target
|
||||
UNIT
|
||||
|
||||
# 用户级 systemd 服务默认在最后一个会话退出后停止;开启 linger 才能在重启后自动拉起 runner。
|
||||
if command -v loginctl >/dev/null 2>&1; then
|
||||
if [ "$SKIP_LINGER" != "1" ] && command -v loginctl >/dev/null 2>&1; then
|
||||
linger=$(loginctl show-user "$USER" -p Linger --value 2>/dev/null || true)
|
||||
if [ "$linger" != "yes" ]; then
|
||||
run sudo loginctl enable-linger "$USER"
|
||||
fi
|
||||
fi
|
||||
run systemctl --user daemon-reload
|
||||
run systemctl --user enable --now gitea-runner.service
|
||||
|
||||
|
||||
+16
-13
@@ -1,22 +1,23 @@
|
||||
# CI(Gitea Actions)
|
||||
|
||||
远端仓库是 Gitea,CI 由 `.gitea/workflows/ci.yml` 定义,运行在 `oracle_arm` 主机上的 self-hosted runner。
|
||||
远端仓库是 Gitea,CI 由 `.gitea/workflows/ci.yml` 定义,运行在本地工作站 `Elitebook` 上的 self-hosted runner(x86_64、Docker、双并发)。旧的 `oracle_arm` runner 已停止并禁用,避免两个 runner 争抢 `ubuntu-latest` 标签。
|
||||
|
||||
## Runner
|
||||
|
||||
安装与运维步骤见 `docs/runner-setup.md`(`deploy/runner/install-runner.sh` 可复现整套配置)。
|
||||
|
||||
- 程序:`gitea-runner` v5.2.0(linux/arm64),位于 `/home/ubuntu/gitea-runner`
|
||||
- 程序:`gitea-runner` v5.2.0(linux/amd64),位于 `~/gitea-runner`
|
||||
- 服务:systemd user unit `gitea-runner.service`
|
||||
- 标签:`ubuntu-latest`、`oracle-arm`
|
||||
- 执行模式:Docker,单并发,任务容器限制 `--cpus=1.5 --memory=4g`
|
||||
- 标签:`ubuntu-latest`、`local-x64`
|
||||
- 执行模式:Docker,双并发,任务容器限制 `--cpus=4 --memory=8g`
|
||||
- 任务镜像:`personal-brand-ci:node24`(预装 pnpm 与 Playwright 依赖,见 `deploy/runner/Dockerfile`)
|
||||
- 作用域:仅 `que01/persionalBrand` 仓库
|
||||
|
||||
查看状态:
|
||||
|
||||
```bash
|
||||
ssh oracle_arm 'systemctl --user status gitea-runner.service'
|
||||
ssh oracle_arm 'journalctl --user -u gitea-runner -n 100 --no-pager'
|
||||
systemctl --user status gitea-runner.service
|
||||
journalctl --user -u gitea-runner -n 100 --no-pager
|
||||
```
|
||||
|
||||
## 当前门禁
|
||||
@@ -26,17 +27,19 @@ ssh oracle_arm 'journalctl --user -u gitea-runner -n 100 --no-pager'
|
||||
- `api`:PostgreSQL service container 上的 API integration
|
||||
- `browser-smoke`:PR 和手动触发时执行会话恢复、创建品牌与页面方案 smoke;只在 PR 和 `workflow_dispatch` 运行,main 合并后不重复执行
|
||||
|
||||
完整浏览器回归仍作为发布前本地门禁执行,避免在 2 核生产主机上运行完整 Playwright 套件抢占资源。PR smoke 只跑两条关键流程,并使用已构建的 Admin 静态产物与 mocked API。
|
||||
完整浏览器回归仍作为发布前本地门禁执行,避免在共享开发机上运行过重的 Playwright 套件。PR smoke 只跑两条关键流程,并使用已构建的 Admin 静态产物与 mocked API。
|
||||
|
||||
## 注意
|
||||
|
||||
Runner 与生产 API 共用 `oracle_arm` 主机。任务容器已限制 CPU 与内存;如果 CI 期间生产延迟明显,应暂停 runner 或迁移到独立主机。
|
||||
Runner 与本地开发工作共用 `Elitebook` 主机,不再与生产 API 共用资源。任务容器限制 4 CPU / 8 GB、并发 2;本地机器关机或休眠时 CI 会排队,required checks 不会自动完成。
|
||||
|
||||
## 缓存
|
||||
|
||||
Runner 内置 cache server(`cache.host=172.17.0.1`、`cache.port=8193`、`cache.dir=/home/ubuntu/gitea-runner/cache-data`),供 `actions/setup-node` 的 pnpm 缓存使用。
|
||||
Runner 内置 cache server(`cache.host=172.17.0.1`、`cache.port=8193`、`cache.dir=~/gitea-runner/cache-data`),供 `actions/cache` 使用(Turbo 缓存等)。
|
||||
|
||||
任务容器与主机之间被 `ufw` 的 `INPUT DROP` 默认策略拦截,需要显式放行 Docker 使用的三个私网网段:
|
||||
pnpm 依赖不再走 actions/cache:宿主机 `~/gitea-runner/pnpm-store` 被 bind mount 到任务容器的 `/workspace/.pnpm-store`,workflow 的 `npm_config_store_dir` 指向该路径。同一轮 CI 里的 static、build、api、browser-smoke 共享一份 store,`pnpm install` 只做链接/校验,不再重复下载 1600+ 个包。
|
||||
|
||||
如果 runner 主机启用了 `ufw`,任务容器到 cache server 的流量会被 `INPUT DROP` 拦截,需要显式放行 Docker 使用的三个私网网段;本地工作站未启用 `ufw`,无需配置:
|
||||
|
||||
```bash
|
||||
sudo ufw allow from 172.16.0.0/12 to any port 8193 proto tcp comment "gitea actions cache"
|
||||
@@ -56,7 +59,7 @@ docker exec <job-container> node -e 'fetch("http://172.17.0.1:8193/").then(r=>co
|
||||
|
||||
Runner 日志级别保持 `debug`:`info` 级别不会记录各 step 的 `Success - Main ...` 与告警,排障时只能依赖 Gitea 页面。
|
||||
|
||||
## 首次完整通过
|
||||
## 迁移前基线(`oracle_arm`)
|
||||
|
||||
| 项 | 值 |
|
||||
| ---------------- | ----------------------------- |
|
||||
@@ -78,11 +81,11 @@ Runner 日志级别保持 `debug`:`info` 级别不会记录各 step 的 `Succe
|
||||
| Production build | 11.7 min | 7.6 min |
|
||||
| API integration | 9.7 min | 3.8 min |
|
||||
|
||||
缓存内容为 pnpm store,首次落盘约 268 MB,位于 `/home/ubuntu/gitea-runner/cache-data`。
|
||||
缓存内容为 pnpm store,首次落盘约 1.1 GB,位于 `~/gitea-runner/pnpm-store`(共享 bind mount)。
|
||||
|
||||
## 触发范围
|
||||
|
||||
- `push` 到 `main` 时忽略纯文档改动(`**.md`),避免 2 核主机为文档提交跑完整 CI。
|
||||
- `push` 到 `main` 时忽略纯文档改动(`**.md`),避免为文档提交跑完整 CI。
|
||||
- `pull_request` 不设置 `paths-ignore`。branch protection 要求的 status check 必须每次都上报,否则纯文档 PR 会一直停在「等待检查」而无法合并。
|
||||
- 需要给纯文档提交补一次状态时,用 `workflow_dispatch` 手动触发。
|
||||
|
||||
|
||||
+41
-11
@@ -1,11 +1,11 @@
|
||||
# CI Runner 安装与运维
|
||||
|
||||
CI 跑在自托管 Gitea Actions runner 上(当前主机 `oracle_arm`,与生产 API 共用 2 核)。本文件记录可复现的安装步骤,避免换机器时重新摸索。
|
||||
CI 跑在自托管 Gitea Actions runner 上。当前使用本地工作站 `Elitebook`(x86_64、12 核、30 GB,Docker 容器执行),旧的 `oracle_arm` runner 已停止并禁用。本文件记录可复现的安装步骤,避免换机器时重新摸索。
|
||||
|
||||
## 一次性准备
|
||||
|
||||
1. 在 Gitea 仓库 Settings → Actions → Runners 里创建注册 token(只对单个仓库或整个实例生效)。
|
||||
2. 目标主机需要:Docker、`curl`、`xz`、`ufw`、systemd、可用 sudo、Node 不需要(任务容器自带)。
|
||||
2. 目标主机需要:Docker、`curl`、`xz`、systemd;Node 不需要(任务容器自带)。`ufw` 和 `sudo` 仅在需要配置防火墙或 linger 时使用。
|
||||
|
||||
## 安装
|
||||
|
||||
@@ -14,8 +14,13 @@ CI 跑在自托管 Gitea Actions runner 上(当前主机 `oracle_arm`,与生
|
||||
```bash
|
||||
GITEA_URL=https://git.example.com \
|
||||
RUNNER_TOKEN=<注册 token> \
|
||||
RUNNER_NAME=oracle-arm \
|
||||
RUNNER_LABELS=ubuntu-latest,oracle-arm \
|
||||
RUNNER_NAME=elitebook-local \
|
||||
RUNNER_LABELS=ubuntu-latest,local-x64 \
|
||||
RUNNER_CAPACITY=2 \
|
||||
RUNNER_CONTAINER_OPTIONS='--cpus=4 --memory=8g' \
|
||||
RUNNER_IMAGE=personal-brand-ci:node24 \
|
||||
RUNNER_PNPM_STORE=$HOME/gitea-runner/pnpm-store \
|
||||
SKIP_LINGER=1 \
|
||||
./install-runner.sh
|
||||
```
|
||||
|
||||
@@ -25,9 +30,30 @@ RUNNER_LABELS=ubuntu-latest,oracle-arm \
|
||||
|
||||
1. 按架构下载 `gitea-runner-<version>-linux-<arch>`,校验 `.sha256` 后解压到 `~/gitea-runner`。
|
||||
2. 用 `--no-interactive` 注册,写出 `.runner`(已存在则跳过,可重复执行)。
|
||||
3. 生成 `config.yaml`:单并发、`docker://node:24-bookworm` 标签、内置 cache server 监听 `172.17.0.1:8193`、任务容器限制 `--cpus=1.5 --memory=4g`。
|
||||
4. 装 systemd user unit `gitea-runner.service`,执行 `loginctl enable-linger` 后 `enable --now`。
|
||||
5. 放行任务容器到 cache 端口的 ufw 规则。
|
||||
3. 生成 `config.yaml`:按 `RUNNER_CAPACITY` 设置并发,使用 `RUNNER_IMAGE`(默认 `node:24-bookworm`)作为任务容器镜像,内置 cache server 监听 `172.17.0.1:8193`,并按 `RUNNER_CONTAINER_OPTIONS` 限制任务容器资源。
|
||||
4. 把 `RUNNER_PNPM_STORE`(默认 `~/gitea-runner/pnpm-store`)bind mount 到任务容器的 `/workspace/.pnpm-store`;workflow 通过 `npm_config_store_dir` 指向同一路径,所有 job 复用这份 pnpm store,避免重复下载依赖。
|
||||
5. 为下载的 runner 二进制补上可执行权限,避免归档解压后出现 `Permission denied`。
|
||||
6. 装 systemd user unit `gitea-runner.service`,执行 `loginctl enable-linger` 后 `enable --now`。
|
||||
7. 放行任务容器到 cache 端口的 ufw 规则。
|
||||
|
||||
## 专用 CI 镜像
|
||||
|
||||
`browser-smoke` 需要 Chromium 及其系统库。为避免每个 job 重复执行 `playwright install --with-deps`,本机使用预构建镜像:
|
||||
|
||||
```bash
|
||||
docker build -f deploy/runner/Dockerfile -t personal-brand-ci:node24 .
|
||||
```
|
||||
|
||||
镜像包含 Node 24、pnpm 9.15.0、git/curl/jq/unzip,以及 Playwright 1.58.2 的 Chromium、headless shell、FFmpeg 和系统依赖。构建产物是本机 amd64 镜像(约 3 GB),不推送到 registry。
|
||||
|
||||
`apps/taro/package.json` 升级 Playwright 后,同步修改 `deploy/runner/Dockerfile` 的 `PLAYWRIGHT_VERSION`,重建镜像并重启 runner:
|
||||
|
||||
```bash
|
||||
docker build -f deploy/runner/Dockerfile -t personal-brand-ci:node24 .
|
||||
systemctl --user restart gitea-runner.service
|
||||
```
|
||||
|
||||
镜像只在当前主机存在;换 runner 主机时需要重新构建。若在 ARM 主机构建,镜像会按该主机架构原生构建,不需要额外参数。
|
||||
|
||||
## 为什么 ufw 要放行三个网段
|
||||
|
||||
@@ -38,10 +64,12 @@ RUNNER_LABELS=ubuntu-latest,oracle-arm \
|
||||
```bash
|
||||
systemctl --user status gitea-runner.service
|
||||
journalctl --user -u gitea-runner -n 100 --no-pager
|
||||
du -sh ~/gitea-runner/cache-data
|
||||
du -sh ~/gitea-runner/cache-data ~/gitea-runner/pnpm-store
|
||||
```
|
||||
|
||||
仓库侧 `pnpm deploy:status` 也会打印 `ci-runner=` 一行。
|
||||
`pnpm-store` 会持续增长。确认没有 job 运行时,可以执行 `pnpm store prune` 清理未被引用的包(在任意任务容器里对 `/workspace/.pnpm-store` 执行,或直接删除旧目录后让下一次 job 重新填充)。
|
||||
|
||||
`pnpm deploy:status` 只检查 VPS 服务、备份和公网路由,不再把 CI runner 当作生产健康条件。runner 已迁到本地工作站,脚本会额外打印非阻断的 `ci-runner-local=`,也可以直接用上面的 `systemctl --user status gitea-runner.service` 检查。
|
||||
|
||||
## 排障
|
||||
|
||||
@@ -50,11 +78,13 @@ du -sh ~/gitea-runner/cache-data
|
||||
| push 后 CI 一直 queued 不启动 | runner 服务是否 active;Gitea 仓库 Runners 页面是否显示 online |
|
||||
| 日志出现 `Failed to GetCacheEntryDownloadURL ... ETIMEDOUT` | ufw 是否放行三个私网段;`docker exec <job-container> node -e 'fetch("http://172.17.0.1:8193/")'` 应返回 404 |
|
||||
| 一轮 CI 突然变慢 | 缓存是否命中;宿主机负载与磁盘余量 |
|
||||
| 生产 API 变慢 | CI 与生产共用主机,检查是否在跑 build/api job;必要时暂停 runner |
|
||||
| 本机开发明显变慢 | 是否同时运行 build/api job;用 `docker stats` 检查任务容器资源 |
|
||||
| 重启后 runner 没起来 | `loginctl show-user "$USER" -p Linger` 应为 `Linger=yes`;否则执行 `sudo loginctl enable-linger "$USER"` |
|
||||
|
||||
## 约束
|
||||
|
||||
- `capacity: 1`:不要提高并发,2 核主机上并发只会让生产和 CI 一起变慢。
|
||||
- 本地 runner 使用 `capacity: 2`,每个任务容器限制 `4 CPU / 8 GB`;按宿主资源调整,不要超过实际可用内存。
|
||||
- `~/gitea-runner/pnpm-store` 是所有 job 共享的 pnpm store。不要删除正在被 job 使用的 store;换 runner 主机时整目录拷贝或重新预热即可。
|
||||
- 本地 runner 关机或休眠时,required checks 会保持 queued。需要开机自启时执行 `sudo loginctl enable-linger "$USER"`,否则用户会话退出后服务会停止。
|
||||
- 日志级别保持 `debug`:`info` 级别不记录各 step 的结果行,排障时等于没有日志。
|
||||
- 完整浏览器回归不进入定时或 main 推送 CI;PR 只运行轻量 browser smoke(见 `docs/ci.md`),完整套件仍在发布前执行。
|
||||
@@ -8,6 +8,8 @@
|
||||
>
|
||||
> 架构决策:ADR 0029:模板管理、导入与分发边界
|
||||
|
||||
> 状态校正(2026-10-23):当前 `pnpm template:doctor` 对 `acheng-campus-food`、`atelier-solopreneur`、`linjing-editorial` 均返回 `staticStatus=pass`、`completionStatus=complete`、`unresolvedIssues=0`。下方 2026-10-17/18 记录中的 `unverified` 是历史证据,不代表当前状态。该报告只证明自动化证据齐全,不替代 Phase 8 的真实品牌操作、微信外部验证和运营审阅。
|
||||
|
||||
本文档把模板从本地开发、导出、线上导入、校验、预览、安装到小程序发布的完整工作固化为一个可追踪任务。后续代码、迁移、接口、后台页面、测试证据和已知缺口都必须回到本文登记。本文描述的是目标和实施门禁;没有对应代码、测试和运行证据的条目不能标记为完成。
|
||||
|
||||
## 1. 背景和目标
|
||||
|
||||
@@ -75,4 +75,4 @@ Admin 直接复用 Taro renderer,模板原始 CSS 按 750 设计宽度转换
|
||||
|
||||
## 本轮边界
|
||||
|
||||
本次先制定计划,功能实施尚未开始。聚焦内容编辑,不做任意拖拽布局或 HTML 入库。保留模板视觉和 H5 回退;不重置数据库或 seed,必要结构调整先制定兼容迁移。
|
||||
截至 2026-10-23,`.codex-tasks/visual-editor-closure/SUBTASKS.csv` 中的 5 个子任务均已标记 `DONE`;本文保留为实现范围、验收标准和后续回归依据,当前状态以该 CSV 和实际验证记录为准。本轮仍聚焦内容编辑,不做任意拖拽布局或 HTML 入库。保留模板视觉和 H5 回退;不重置数据库或 seed,必要结构调整先制定兼容迁移。
|
||||
+39
-10
@@ -1,9 +1,10 @@
|
||||
import path from "node:path";
|
||||
import { spawnSync } from "node:child_process";
|
||||
import { fileURLToPath } from "node:url";
|
||||
import { fileURLToPath, pathToFileURL } from "node:url";
|
||||
|
||||
const root = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "../..");
|
||||
const target = process.env.DEPLOY_TARGET ?? "oracle_arm";
|
||||
const deployRoot = process.env.DEPLOY_ROOT ?? "/home/ubuntu/persional-brand";
|
||||
const publicBaseUrl = (process.env.PUBLIC_BASE_URL ?? "https://wechat.app.que01.top").replace(
|
||||
/\/$/,
|
||||
"",
|
||||
@@ -21,24 +22,47 @@ function shellQuote(value) {
|
||||
return "'" + value.replace(/'/g, "'\\''") + "'";
|
||||
}
|
||||
|
||||
const remoteScript = [
|
||||
/**
|
||||
* 生产状态检查只覆盖 VPS 上的服务和公网路由。
|
||||
* CI runner 已迁到本地工作站,不能再把远端 gitea-runner.service 当成生产健康条件。
|
||||
*/
|
||||
export function buildRemoteStatusScript({ deployRoot: rootPath = deployRoot } = {}) {
|
||||
if (!/^\/[a-zA-Z0-9_./-]+$/.test(rootPath)) throw new Error("Invalid deployment root");
|
||||
|
||||
return [
|
||||
"set -euo pipefail",
|
||||
'source "$HOME/.nvm/nvm.sh"',
|
||||
"export DEPLOY_ROOT=/home/ubuntu/persional-brand",
|
||||
'printf "current=%s\\n" "$(readlink /home/ubuntu/persional-brand/current)"',
|
||||
`export DEPLOY_ROOT=${shellQuote(rootPath)}`,
|
||||
'printf "current=%s\\n" "$(readlink "$DEPLOY_ROOT/current")"',
|
||||
'printf "api="; test "$(pm2 pid personal-brand-api)" != "0"; echo online',
|
||||
'printf "pm2-autostart="; systemctl --user is-enabled personal-brand-pm2.service',
|
||||
'printf "admin="; systemctl --user is-active personal-brand-admin-static.service',
|
||||
'printf "database="; docker inspect -f "{{.State.Status}}" personal-brand-postgres-1',
|
||||
'printf "ci-runner="; systemctl --user is-active gitea-runner.service',
|
||||
'printf "backups="; find /home/ubuntu/persional-brand/shared/backups -maxdepth 1 -name "*.dump" | wc -l',
|
||||
'printf "latest-backup="; newest=$(find /home/ubuntu/persional-brand/shared/backups -maxdepth 1 -type f -name "*.dump" -printf "%T@ %p\\n" | sort -nr | head -1 | cut -d" " -f2-); test -n "$newest"; stat -c "%y %s bytes" "$newest"; docker exec -i personal-brand-postgres-1 pg_restore -l < "$newest" >/dev/null; echo readable',
|
||||
'printf "backup-temp-files="; find /home/ubuntu/persional-brand/shared/backups -maxdepth 1 -type f -name "*.tmp" | wc -l',
|
||||
'printf "backups="; find "$DEPLOY_ROOT/shared/backups" -maxdepth 1 -name "*.dump" | wc -l',
|
||||
'printf "latest-backup="; newest=$(find "$DEPLOY_ROOT/shared/backups" -maxdepth 1 -type f -name "*.dump" -printf "%T@ %p\\n" | sort -nr | head -1 | cut -d" " -f2-); test -n "$newest"; stat -c "%y %s bytes" "$newest"; docker exec -i personal-brand-postgres-1 pg_restore -l < "$newest" >/dev/null; echo readable',
|
||||
'printf "backup-temp-files="; find "$DEPLOY_ROOT/shared/backups" -maxdepth 1 -type f -name "*.tmp" | wc -l',
|
||||
'printf "disk="; df -h / | awk \'NR==2 {print $5 " used, " $4 " free"}\'',
|
||||
'printf "release-count="; find /home/ubuntu/persional-brand/releases -mindepth 1 -maxdepth 1 -type d | wc -l',
|
||||
'printf "release-count="; find "$DEPLOY_ROOT/releases" -mindepth 1 -maxdepth 1 -type d | wc -l',
|
||||
].join("; ");
|
||||
}
|
||||
|
||||
run("ssh", [target, "bash -lc " + shellQuote(remoteScript)]);
|
||||
/**
|
||||
* CI runner 与生产状态是两件事。这里只做本地提示,runner 不活跃不应阻断部署状态检查。
|
||||
*/
|
||||
function printLocalRunnerStatus() {
|
||||
const result = spawnSync("systemctl", ["--user", "is-active", "gitea-runner.service"], {
|
||||
encoding: "utf8",
|
||||
});
|
||||
const state = (result.stdout || "").trim();
|
||||
process.stdout.write(`ci-runner-local=${state || "unknown"}\n`);
|
||||
}
|
||||
|
||||
function main() {
|
||||
if (!/^[a-zA-Z0-9_.@:-]+$/.test(target)) throw new Error("Invalid deployment SSH target");
|
||||
if (!/^\/[a-zA-Z0-9_./-]+$/.test(deployRoot)) throw new Error("Invalid deployment root");
|
||||
|
||||
run("ssh", [target, "bash -lc " + shellQuote(buildRemoteStatusScript())]);
|
||||
printLocalRunnerStatus();
|
||||
|
||||
for (const route of [
|
||||
"/admin/",
|
||||
@@ -59,3 +83,8 @@ for (const route of [
|
||||
publicBaseUrl + route,
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href) {
|
||||
main();
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
import assert from "node:assert/strict";
|
||||
import { spawnSync } from "node:child_process";
|
||||
import test from "node:test";
|
||||
import { buildRemoteStatusScript } from "./status.mjs";
|
||||
|
||||
test("生产状态脚本不再要求 VPS 上运行 CI runner", () => {
|
||||
const script = buildRemoteStatusScript();
|
||||
|
||||
assert.doesNotMatch(script, /gitea-runner/);
|
||||
assert.match(script, /pm2 pid personal-brand-api/);
|
||||
assert.match(script, /pg_restore -l/);
|
||||
});
|
||||
|
||||
test("生产状态脚本语法有效", () => {
|
||||
const result = spawnSync("bash", ["-n"], {
|
||||
input: buildRemoteStatusScript(),
|
||||
encoding: "utf8",
|
||||
});
|
||||
|
||||
assert.equal(result.status, 0, result.stderr);
|
||||
});
|
||||
|
||||
test("生产状态脚本使用调用方指定的部署目录", () => {
|
||||
const script = buildRemoteStatusScript({ deployRoot: "/srv/personal-brand" });
|
||||
|
||||
assert.match(script, /DEPLOY_ROOT='\/srv\/personal-brand'/);
|
||||
assert.match(script, /"\$DEPLOY_ROOT\/current"/);
|
||||
});
|
||||
|
||||
test("非法部署目录会被拒绝", () => {
|
||||
assert.throws(() => buildRemoteStatusScript({ deployRoot: "/srv/personal brand" }), /Invalid/);
|
||||
});
|
||||
Reference in new issue
Block a user