From 447c224fcef4cd5399ff9679e20a95d190321cbb Mon Sep 17 00:00:00 2001 From: que01 Date: Fri, 23 Oct 2026 17:37:48 +0800 Subject: [PATCH] =?UTF-8?q?ci:=20=E9=A2=84=E7=83=AD=20Prisma=20=E5=B9=B6?= =?UTF-8?q?=E7=A7=BB=E9=99=A4=E8=BF=90=E8=A1=8C=E6=97=B6=20Node=20?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/ci.yml | 72 +++++++++++++++++++++++++++++----------- deploy/runner/Dockerfile | 10 ++++++ docs/ci.md | 6 ++++ docs/runner-setup.md | 6 ++-- 4 files changed, 72 insertions(+), 22 deletions(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 3414601..313229b 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -28,12 +28,20 @@ jobs: timeout-minutes: 40 steps: - uses: actions/checkout@v4 - - uses: pnpm/action-setup@v4 + - name: Verify preinstalled toolchain + # 任务镜像已内置 Node 与 pnpm;不在这里下载 Node,避免 nodejs.org 慢连接拖死整个 job。 + run: | + actual_node="$(node -p 'process.versions.node')" + actual_pnpm="$(pnpm --version)" + test "${actual_node%%.*}" = "$NODE_VERSION" || { echo "expected Node $NODE_VERSION.x, got $actual_node" >&2; exit 1; } + test "$actual_pnpm" = "$PNPM_VERSION" || { echo "expected pnpm $PNPM_VERSION, got $actual_pnpm" >&2; exit 1; } + - name: Restore Prisma engine cache + uses: actions/cache@v4 with: - version: ${{ env.PNPM_VERSION }} - - uses: actions/setup-node@v4 - with: - node-version: ${{ env.NODE_VERSION }} + path: ~/.cache/prisma + key: prisma-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('pnpm-lock.yaml') }} + restore-keys: | + prisma-${{ runner.os }}-${{ runner.arch }}- - name: Restore Turbo cache uses: actions/cache@v4 with: @@ -59,12 +67,20 @@ jobs: needs: [static] steps: - uses: actions/checkout@v4 - - uses: pnpm/action-setup@v4 + - name: Verify preinstalled toolchain + # 任务镜像已内置 Node 与 pnpm;不在这里下载 Node,避免 nodejs.org 慢连接拖死整个 job。 + run: | + actual_node="$(node -p 'process.versions.node')" + actual_pnpm="$(pnpm --version)" + test "${actual_node%%.*}" = "$NODE_VERSION" || { echo "expected Node $NODE_VERSION.x, got $actual_node" >&2; exit 1; } + test "$actual_pnpm" = "$PNPM_VERSION" || { echo "expected pnpm $PNPM_VERSION, got $actual_pnpm" >&2; exit 1; } + - name: Restore Prisma engine cache + uses: actions/cache@v4 with: - version: ${{ env.PNPM_VERSION }} - - uses: actions/setup-node@v4 - with: - node-version: ${{ env.NODE_VERSION }} + path: ~/.cache/prisma + key: prisma-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('pnpm-lock.yaml') }} + restore-keys: | + prisma-${{ runner.os }}-${{ runner.arch }}- - name: Restore Turbo cache uses: actions/cache@v4 with: @@ -86,12 +102,20 @@ jobs: timeout-minutes: 30 steps: - uses: actions/checkout@v4 - - uses: pnpm/action-setup@v4 + - name: Verify preinstalled toolchain + # 任务镜像已内置 Node 与 pnpm;不在这里下载 Node,避免 nodejs.org 慢连接拖死整个 job。 + run: | + actual_node="$(node -p 'process.versions.node')" + actual_pnpm="$(pnpm --version)" + test "${actual_node%%.*}" = "$NODE_VERSION" || { echo "expected Node $NODE_VERSION.x, got $actual_node" >&2; exit 1; } + test "$actual_pnpm" = "$PNPM_VERSION" || { echo "expected pnpm $PNPM_VERSION, got $actual_pnpm" >&2; exit 1; } + - name: Restore Prisma engine cache + uses: actions/cache@v4 with: - version: ${{ env.PNPM_VERSION }} - - uses: actions/setup-node@v4 - with: - node-version: ${{ env.NODE_VERSION }} + path: ~/.cache/prisma + key: prisma-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('pnpm-lock.yaml') }} + restore-keys: | + prisma-${{ runner.os }}-${{ runner.arch }}- - run: pnpm install --frozen-lockfile - name: Cache Playwright browsers uses: actions/cache@v4 @@ -127,12 +151,20 @@ jobs: SEED_ADMIN_PASSWORD: ci-integration-admin-password steps: - uses: actions/checkout@v4 - - uses: pnpm/action-setup@v4 + - name: Verify preinstalled toolchain + # 任务镜像已内置 Node 与 pnpm;不在这里下载 Node,避免 nodejs.org 慢连接拖死整个 job。 + run: | + actual_node="$(node -p 'process.versions.node')" + actual_pnpm="$(pnpm --version)" + test "${actual_node%%.*}" = "$NODE_VERSION" || { echo "expected Node $NODE_VERSION.x, got $actual_node" >&2; exit 1; } + test "$actual_pnpm" = "$PNPM_VERSION" || { echo "expected pnpm $PNPM_VERSION, got $actual_pnpm" >&2; exit 1; } + - name: Restore Prisma engine cache + uses: actions/cache@v4 with: - version: ${{ env.PNPM_VERSION }} - - uses: actions/setup-node@v4 - with: - node-version: ${{ env.NODE_VERSION }} + path: ~/.cache/prisma + key: prisma-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('pnpm-lock.yaml') }} + restore-keys: | + prisma-${{ runner.os }}-${{ runner.arch }}- - run: pnpm install --frozen-lockfile - name: Prepare API test env working-directory: apps/api diff --git a/deploy/runner/Dockerfile b/deploy/runner/Dockerfile index c5f41de..f4a8972 100644 --- a/deploy/runner/Dockerfile +++ b/deploy/runner/Dockerfile @@ -6,6 +6,8 @@ FROM node:24-bookworm ARG PNPM_VERSION=9.15.0 ARG PLAYWRIGHT_VERSION=1.58.2 +# 必须与 pnpm-lock.yaml 中解析出的 Prisma 版本一致;升级 Prisma 后同步修改并重建镜像。 +ARG PRISMA_VERSION=6.19.3 ENV PNPM_HOME=/usr/local/share/pnpm ENV PATH=${PNPM_HOME}:${PATH} @@ -22,4 +24,12 @@ RUN corepack enable \ RUN npx --yes playwright@${PLAYWRIGHT_VERSION} install --with-deps chromium \ && rm -rf /var/lib/apt/lists/* +# 预热 Prisma engines 到 /root/.cache/prisma。CI job 每次都是新容器,若不预热, +# 每个 job 的 prisma generate 都会重新访问 binaries.prisma.sh,网络抖动会直接拖垮 CI。 +COPY apps/api/prisma/schema.prisma /tmp/prisma-warmup/schema.prisma +RUN printf '%s\n' '{"name":"prisma-warmup","private":true}' > /tmp/prisma-warmup/package.json \ + && cd /tmp/prisma-warmup \ + && DATABASE_URL=postgresql://warmup:warmup@127.0.0.1:5432/warmup npx --yes prisma@${PRISMA_VERSION} generate --schema schema.prisma \ + && rm -rf /tmp/prisma-warmup /root/.npm + WORKDIR /workspace diff --git a/docs/ci.md b/docs/ci.md index 2156b2f..330b8ab 100644 --- a/docs/ci.md +++ b/docs/ci.md @@ -33,6 +33,12 @@ journalctl --user -u gitea-runner -n 100 --no-pager Runner 与本地开发工作共用 `Elitebook` 主机,不再与生产 API 共用资源。任务容器限制 4 CPU / 8 GB、并发 2;本地机器关机或休眠时 CI 会排队,required checks 不会自动完成。 +## 工具链与外部下载 + +任务镜像 `personal-brand-ci:node24` 已内置 Node 24 和 pnpm 9.15.0;workflow 不再调用 `actions/setup-node` 或 `pnpm/action-setup`,而是在每个 job 开头执行 `Verify preinstalled toolchain`。这样不会因为 nodejs.org 下载缓慢或中断而把 job 卡到超时。 + +Prisma engines 在构建镜像时预热到 `/root/.cache/prisma`,job 内 `pnpm install` 触发的 `prisma generate` 直接命中缓存,不再访问 `binaries.prisma.sh`。workflow 仍用 `actions/cache` 缓存该目录,作为更换镜像或镜像未预热时的兜底。升级 Prisma 后必须同步 `deploy/runner/Dockerfile` 的 `PRISMA_VERSION` 并重建镜像。 + ## 缓存 Runner 内置 cache server(`cache.host=172.17.0.1`、`cache.port=8193`、`cache.dir=~/gitea-runner/cache-data`),供 `actions/cache` 使用(Turbo 缓存等)。 diff --git a/docs/runner-setup.md b/docs/runner-setup.md index 9476712..58d192c 100644 --- a/docs/runner-setup.md +++ b/docs/runner-setup.md @@ -44,9 +44,11 @@ SKIP_LINGER=1 \ 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。 +镜像包含 Node 24、pnpm 9.15.0、git/curl/jq/unzip,以及 Playwright 1.58.2 的 Chromium、headless shell、FFmpeg 和系统依赖;构建时还会预热 Prisma engines 到 `/root/.cache/prisma`。构建产物是本机 amd64 镜像(约 3 GB),不推送到 registry。 -`apps/taro/package.json` 升级 Playwright 后,同步修改 `deploy/runner/Dockerfile` 的 `PLAYWRIGHT_VERSION`,重建镜像并重启 runner: +workflow 不再使用 `actions/setup-node` 或 `pnpm/action-setup`,而是直接校验镜像内置的 Node/pnpm 版本。因此替换 `RUNNER_IMAGE` 时必须保证镜像内已有 Node 24 和 pnpm 9.15.0,否则 job 会在 `Verify preinstalled toolchain` 步骤失败。 + +`apps/taro/package.json` 升级 Playwright 后,同步修改 `deploy/runner/Dockerfile` 的 `PLAYWRIGHT_VERSION`;升级 Prisma 后,同步修改 `PRISMA_VERSION`。然后重建镜像并重启 runner: ```bash docker build -f deploy/runner/Dockerfile -t personal-brand-ci:node24 .