From 8a55621e2c560b020251df52be2a6c3c42847b6c Mon Sep 17 00:00:00 2001 From: catShark <1716967236@qq.com> Date: Sun, 8 Nov 2026 19:18:05 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BD=92=E6=A1=A3=E6=94=B9=E7=94=A8=20R?= =?UTF-8?q?elease=20API=EF=BC=88runner=20=E6=97=A0=20node=EF=BC=8CJS=20act?= =?UTF-8?q?ion=20=E6=97=A0=E6=B3=95=E8=BF=90=E8=A1=8C=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/build.yml | 65 +++++++++++++++++++++++++++++++++----- AGENTS.md | 7 ++-- README.md | 2 +- 3 files changed, 63 insertions(+), 11 deletions(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 01a8124..7180571 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -19,6 +19,11 @@ env: DEV_API: https://lpt-dev.cat-shark.xyz/api PROD_API: https://lpt.cat-shark.xyz/api +# 上传 Release 附件需要写权限。Gitea 会给每个 job 注入一个仓库范围的 GITEA_TOKEN, +# 它的权限由这里声明(再受实例最大值限制)。 +permissions: + contents: write + jobs: build: runs-on: ubuntu-latest @@ -100,11 +105,55 @@ jobs: ls -l "$NAME" sha256sum "$NAME" | tee apk-sha256.txt - - name: 归档 APK - uses: actions/upload-artifact@v4 - with: - name: lpt-android-${{ inputs.environment }}-apk - path: | - *.apk - apk-sha256.txt - if-no-files-found: error + - name: 上传 APK 到 Release 附件 + env: + TOKEN: ${{ secrets.GITEA_TOKEN }} + GITEA_REF: ${{ gitea.ref }} + ENV_NAME: ${{ inputs.environment }} + SHA: ${{ gitea.sha }} + run: | + set -euo pipefail + if [ -z "${TOKEN:-}" ]; then + echo "ERROR: GITEA_TOKEN 为空——本步骤依赖 Gitea 为每个 job 自动注入的仓库令牌" + exit 1 + fi + + API="https://git.cat-shark.xyz/api/v1/repos/cat-shark/lpt-android" + BRANCH="${GITEA_REF#refs/heads/}" + TAG="android-${ENV_NAME}" + ASSET="lpt-android-${ENV_NAME}.apk" + SHORT="$(echo "$SHA" | cut -c1-8)" + APK="lpt-android-${ENV_NAME}-${SHORT}.apk" + test -f "$APK" + AUTH=(-H "Authorization: token ${TOKEN}") + + # 1) 找滚动 release;不存在就创建(tag 不存在时 Gitea 会按 target_commitish 建) + RID="$(curl -sS "${AUTH[@]}" "$API/releases/tags/$TAG" \ + | python3 -c 'import sys,json;print(json.load(sys.stdin).get("id",""))' 2>/dev/null || true)" + if [ -z "$RID" ]; then + echo "创建滚动 release: $TAG(分支 $BRANCH)" + RID="$(curl -fsS "${AUTH[@]}" -H 'Content-Type: application/json' -X POST "$API/releases" \ + -d "{\"tag_name\":\"$TAG\",\"target_commitish\":\"$BRANCH\",\"name\":\"LPT Android ${ENV_NAME}(滚动发布)\",\"body\":\"附件始终是该环境最新一次构建,每次覆盖;sha256 见对应构建日志。\"}" \ + | python3 -c 'import sys,json;print(json.load(sys.stdin)["id"])')" + fi + echo "release id=$RID" + + # 2) 同名附件先删,保证下载链接稳定 + ASSETS_JSON="$(mktemp)" + for NAME in "$ASSET" "${ASSET}.sha256"; do + curl -fsS "${AUTH[@]}" "$API/releases/$RID/assets" -o "$ASSETS_JSON" + OLD_IDS="$(ASSET_NAME="$NAME" python3 -c 'import json,os,sys;print("\n".join(str(a["id"]) for a in json.load(open(sys.argv[1])) if a["name"]==os.environ["ASSET_NAME"]))' "$ASSETS_JSON")" + for AID in $OLD_IDS; do + echo "删除旧附件 $NAME (id=$AID)" + curl -fsS "${AUTH[@]}" -X DELETE "$API/releases/assets/$AID" > /dev/null + done + done + + # 3) 上传新附件 + curl -fsS "${AUTH[@]}" -X POST "$API/releases/$RID/assets?name=$ASSET" \ + -F "attachment=@${APK}" > /dev/null + curl -fsS "${AUTH[@]}" -X POST "$API/releases/$RID/assets?name=${ASSET}.sha256" \ + -F "attachment=@apk-sha256.txt" > /dev/null + + echo "OK: https://git.cat-shark.xyz/cat-shark/lpt-android/releases/tag/$TAG" + echo "附件: $ASSET / ${ASSET}.sha256(本次 sha=${SHORT})" diff --git a/AGENTS.md b/AGENTS.md index 002ab47..60d4596 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -57,8 +57,11 @@ - 构建在 Gitea 手动触发 `.gitea/workflows/build.yml`(dev/prod 二选一),不需要签本地环境: 1. 校验「分支 ↔ 环境」(从 dev 发 prod 直接被拒); 2. 校验代码里的 `DEFAULT_BASE_URL` 是否与本环境一致,不一致直接失败; - 3. 容器内构建 APK(`ci/Dockerfile` 固定 JDK 17 / cmdline-tools / android-36),产物归档为 Actions artifact 并打印 sha256。 -- APK 不入 Git(`.gitignore` 已忽略 `*.apk`),分发走 Actions artifact。 + 3. 容器内构建 APK(`ci/Dockerfile` 固定 JDK 17 / cmdline-tools / android-36),产物上传到该环境的**滚动 Release** 并在日志打印 sha256。 +- APK 不入 Git(`.gitignore` 已忽略 `*.apk`),分发走 Release 附件: + `https://git.cat-shark.xyz/cat-shark/lpt-android/releases/tag/android-dev`(生产为 `android-prod`),每次构建覆盖同名附件。 +- **本仓库的流水线不使用任何 `uses:` action**:runner 上没有 `node`,JS action(含 `actions/upload-artifact`)会报 `Cannot find: node in PATH`。 + 归档改用 Gitea 的 Release API + `curl`,凭据用 Gitea 为每个 job 自动注入的 `secrets.GITEA_TOKEN`(权限由 workflow 的 `permissions: contents: write` 声明)。新增步骤时同样优先纯 shell。 ## 提交规范 diff --git a/README.md b/README.md index 8e56809..efeddfc 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ LPT 的学习计时原本只能在电脑浏览器里进行;而真实的学习 两个分支**只差 `ApiClient.DEFAULT_BASE_URL` 一行**;安装后仍可在「设置」页临时改地址(调试用)。 -打包走 Gitea Actions 的 `lpt-android Build`(手动触发,选 `dev` 或 `prod`),它会先校验「分支 ↔ 默认地址」是否匹配,再把 APK 归档成 artifact——本地不需要配签名环境。 +打包走 Gitea Actions 的 `lpt-android Build`(手动触发,选 `dev` 或 `prod`):先校验「分支 ↔ 默认地址」是否匹配,再在容器里构建,最后把 APK 传到该环境的**滚动 Release**(`android-dev` / `android-prod`,附件每次覆盖)——本地不需要配签名环境。 ## 构建与安装