fix: 上传附件改为纯 shell 解析(runner 无 python3/jq)并加上传后回读校验
This commit is contained in:
+55
-10
@@ -113,6 +113,12 @@ jobs:
|
||||
SHA: ${{ gitea.sha }}
|
||||
run: |
|
||||
set -euo pipefail
|
||||
|
||||
# runner 上只有 coreutils / grep / curl:不得依赖 python3、jq、node
|
||||
# (历史上这三个都缺过:JS action 报 node,本步曾报 python3)
|
||||
for t in curl grep cut head sed mktemp; do
|
||||
command -v "$t" > /dev/null || { echo "ERROR: runner 缺少命令 $t"; exit 1; }
|
||||
done
|
||||
if [ -z "${TOKEN:-}" ]; then
|
||||
echo "ERROR: GITEA_TOKEN 为空——本步骤依赖 Gitea 为每个 job 自动注入的仓库令牌"
|
||||
exit 1
|
||||
@@ -127,26 +133,50 @@ jobs:
|
||||
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)"
|
||||
# 纯 shell 取 JSON 字段(不依赖 python3/jq)。
|
||||
# 正则对空白宽容(Gitea 默认是紧凑 JSON,但保留容错以便任何重编码都不影响)。
|
||||
# 找不到时返回空(`|| true`),否则 set -e 会直接中断。
|
||||
name_re() { printf '%s' "$1" | sed 's/[.[\*^$()+?{}|]/\\&/g'; }
|
||||
first_id() { grep -oE '"id"[[:space:]]*:[[:space:]]*[0-9]+' | head -1 | grep -oE '[0-9]+' | head -1 || true; }
|
||||
asset_id() {
|
||||
grep -oE '\{[[:space:]]*"id"[[:space:]]*:[[:space:]]*[0-9]+[[:space:]]*,[[:space:]]*"name"[[:space:]]*:[[:space:]]*"[^"]*"' \
|
||||
| grep -E "\"name\"[[:space:]]*:[[:space:]]*\"$(name_re "$1")\"" \
|
||||
| head -1 \
|
||||
| sed -E 's/^\{[[:space:]]*"id"[[:space:]]*:[[:space:]]*([0-9]+).*/\1/' || true
|
||||
}
|
||||
|
||||
# 1) 找滚动 release(看状态码而不是解析错误体);不存在就创建
|
||||
REL_JSON="$(mktemp)"
|
||||
CODE="$(curl -sS -o "$REL_JSON" -w '%{http_code}' "${AUTH[@]}" "$API/releases/tags/$TAG")"
|
||||
echo "查 $TAG: HTTP $CODE"
|
||||
if [ "$CODE" = "200" ]; then
|
||||
RID="$(cat "$REL_JSON" | first_id)"
|
||||
else
|
||||
RID=""
|
||||
fi
|
||||
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"])')"
|
||||
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 见对应构建日志。\"}" \
|
||||
-o "$REL_JSON"
|
||||
RID="$(cat "$REL_JSON" | first_id)"
|
||||
if [ -z "$RID" ]; then
|
||||
echo "ERROR: 创建 release 后拿不到 id,响应前 300 字节:"
|
||||
head -c 300 "$REL_JSON"; echo
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
echo "release id=$RID"
|
||||
|
||||
# 2) 同名附件先删,保证下载链接稳定
|
||||
ASSETS_JSON="$(mktemp)"
|
||||
curl -fsS "${AUTH[@]}" "$API/releases/$RID/assets" -o "$ASSETS_JSON"
|
||||
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
|
||||
AID="$(cat "$ASSETS_JSON" | asset_id "$NAME")"
|
||||
if [ -n "$AID" ]; then
|
||||
echo "删除旧附件 $NAME (id=$AID)"
|
||||
curl -fsS "${AUTH[@]}" -X DELETE "$API/releases/assets/$AID" > /dev/null
|
||||
done
|
||||
fi
|
||||
done
|
||||
|
||||
# 3) 上传新附件
|
||||
@@ -155,5 +185,20 @@ jobs:
|
||||
curl -fsS "${AUTH[@]}" -X POST "$API/releases/$RID/assets?name=${ASSET}.sha256" \
|
||||
-F "attachment=@apk-sha256.txt" > /dev/null
|
||||
|
||||
# 4) 回读校验:两个附件名都能在 release 上找到(不依赖任何外部工具)
|
||||
curl -fsS "${AUTH[@]}" "$API/releases/$RID/assets" -o "$ASSETS_JSON"
|
||||
MISSING=0
|
||||
for NAME in "$ASSET" "${ASSET}.sha256"; do
|
||||
if grep -qE "\"name\"[[:space:]]*:[[:space:]]*\"$(name_re "$NAME")\"" "$ASSETS_JSON"; then
|
||||
echo "OK: 已上传 $NAME"
|
||||
else
|
||||
echo "ERROR: 附件 $NAME 上传后读不到"; MISSING=1
|
||||
fi
|
||||
done
|
||||
if [ "$MISSING" != "0" ]; then
|
||||
echo "release 附件列表响应:"; head -c 500 "$ASSETS_JSON"; echo
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "OK: https://git.cat-shark.xyz/cat-shark/lpt-android/releases/tag/$TAG"
|
||||
echo "附件: $ASSET / ${ASSET}.sha256(本次 sha=${SHORT})"
|
||||
|
||||
@@ -60,8 +60,8 @@
|
||||
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。
|
||||
- **本仓库的流水线不使用任何 `uses:` action**,也不得依赖 `python3` / `jq`(runner 上都没有,历史报错:`Cannot find: node in PATH`、`python3: command not found`)。
|
||||
归档改用 Gitea 的 Release API + `curl`,只用 `grep`/`sed`/`cut` 解析 JSON,凭据用 Gitea 为每个 job 自动注入的 `secrets.GITEA_TOKEN`(权限由 workflow 的 `permissions: contents: write` 声明)。新增步骤前先确认工具在 runner 上存在(脚本开头有 `command -v` 预检)。
|
||||
|
||||
## 提交规范
|
||||
|
||||
|
||||
Reference in New Issue
Block a user