fix(ci): 加固 UpYun 上传步骤,修复 upx 下载挂死
Deploy to Production / pre-check (push) Successful in 54s
Deploy to Production / build (push) Successful in 18m13s
Deploy to Production / deploy-edgeone (push) Successful in 11s
Deploy to Production / deploy-upyun (push) Successful in 6s
Deploy to Production / finalize (push) Successful in 12m29s
Deploy to Production / notify-failure (push) Skipped
Deploy to Production / pre-check (push) Successful in 54s
Deploy to Production / build (push) Successful in 18m13s
Deploy to Production / deploy-edgeone (push) Successful in 11s
Deploy to Production / deploy-upyun (push) Successful in 6s
Deploy to Production / finalize (push) Successful in 12m29s
Deploy to Production / notify-failure (push) Skipped
根因:collection.b0.upaiyun.com 实测 2/3 概率整站无响应, 而 curl -sL 无 --max-time,导致步骤永久挂起直到 job 15 分钟超时。 改动: - upx 主源改用 GitHub Releases(实测 0.5s 稳定),原 CDN 降为兜底 - curl 加 --connect-timeout/--max-time/--retry - upx login/put 加 timeout 兜底,sync 加 480s 上限 - 删除无效的 Cache upx 步骤(缓存路径 /tmp 随 job 容器销毁,永远命中不了) - 给 Upload to UpYun 加 timeout-minutes: 10
This commit is contained in:
1 parent
33d54453d7
commit
83d87ddeaf
1 file changed
+32
-19
@@ -264,15 +264,9 @@ jobs:
|
|||||||
echo "📤 更新 hash 文件到腾讯云 COS..."
|
echo "📤 更新 hash 文件到腾讯云 COS..."
|
||||||
coscmd upload public/.build_hash /__build_hash
|
coscmd upload public/.build_hash /__build_hash
|
||||||
|
|
||||||
- name: Cache upx
|
|
||||||
uses: actions/cache@v4
|
|
||||||
id: upx-cache
|
|
||||||
with:
|
|
||||||
path: /tmp/upyun-upx
|
|
||||||
key: upx-0.4.9
|
|
||||||
|
|
||||||
- name: Upload to UpYun
|
- name: Upload to UpYun
|
||||||
if: steps.check-upload.outputs.need_upload == 'true'
|
if: steps.check-upload.outputs.need_upload == 'true'
|
||||||
|
timeout-minutes: 10
|
||||||
env:
|
env:
|
||||||
UPYUN_SERVICE: ${{ secrets.UPYUN_BUCKET }}
|
UPYUN_SERVICE: ${{ secrets.UPYUN_BUCKET }}
|
||||||
UPYUN_OPERATOR: ${{ secrets.UPYUN_OPERATOR }}
|
UPYUN_OPERATOR: ${{ secrets.UPYUN_OPERATOR }}
|
||||||
@@ -281,21 +275,40 @@ jobs:
|
|||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
run: |
|
run: |
|
||||||
echo "📤 上传构建产物到 UpYun..."
|
echo "📤 上传构建产物到 UpYun..."
|
||||||
|
|
||||||
UPX_VERSION="0.4.9"
|
UPX_VERSION="0.4.9"
|
||||||
UPX_URL="https://collection.b0.upaiyun.com/softwares/upx/upx_${UPX_VERSION}_linux_amd64.tar.gz"
|
|
||||||
UPX_BIN="/tmp/upyun-upx"
|
UPX_BIN="/tmp/upyun-upx"
|
||||||
|
|
||||||
|
# 主源用 GitHub Releases(实测 0.5s 稳定),
|
||||||
|
# 官方 collection.b0.upaiyun.com 实测 2/3 概率整站无响应,仅作兜底
|
||||||
|
UPX_URLS=(
|
||||||
|
"https://github.com/upyun/upx/releases/download/v${UPX_VERSION}/upx_${UPX_VERSION}_linux_amd64.tar.gz"
|
||||||
|
"https://collection.b0.upaiyun.com/softwares/upx/upx_${UPX_VERSION}_linux_amd64.tar.gz"
|
||||||
|
)
|
||||||
|
|
||||||
if [ ! -x "$UPX_BIN" ]; then
|
if [ ! -x "$UPX_BIN" ]; then
|
||||||
curl -sL "$UPX_URL" -o /tmp/upx.tar.gz
|
ok=false
|
||||||
tar -xzf /tmp/upx.tar.gz -C /tmp
|
for U in "${UPX_URLS[@]}"; do
|
||||||
mv /tmp/upx "$UPX_BIN"
|
echo "⬇️ 下载 upx: $U"
|
||||||
chmod +x "$UPX_BIN"
|
if curl -fsSL --connect-timeout 10 --max-time 60 --retry 2 --retry-delay 2 \
|
||||||
|
-o /tmp/upx.tar.gz "$U"; then
|
||||||
|
if tar -xzf /tmp/upx.tar.gz -C /tmp && [ -f /tmp/upx ]; then
|
||||||
|
mv /tmp/upx "$UPX_BIN" && chmod +x "$UPX_BIN" && ok=true
|
||||||
|
echo "✅ upx 就绪: $("$UPX_BIN" --version 2>&1 | head -1)"
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
echo "⚠️ 该源失败,尝试下一个..."
|
||||||
|
done
|
||||||
|
if [ "$ok" != "true" ]; then
|
||||||
|
echo "❌ 所有 upx 下载源均失败,跳过 UpYun 上传"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
for i in 1 2 3 4 5; do
|
for i in 1 2 3 4 5; do
|
||||||
echo "🔐 UpYun 登录 (尝试 $i/5)..."
|
echo "🔐 UpYun 登录 (尝试 $i/5)..."
|
||||||
if "$UPX_BIN" login "$UPYUN_SERVICE" "$UPYUN_OPERATOR" "$UPYUN_PASSWORD" 2>&1; then
|
if timeout 30 "$UPX_BIN" login "$UPYUN_SERVICE" "$UPYUN_OPERATOR" "$UPYUN_PASSWORD" 2>&1; then
|
||||||
echo "✅ 登录成功"
|
echo "✅ 登录成功"
|
||||||
break
|
break
|
||||||
else
|
else
|
||||||
@@ -303,10 +316,10 @@ jobs:
|
|||||||
sleep 10
|
sleep 10
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
echo "🔄 开始上传到 UpYun..."
|
echo "🔄 开始上传到 UpYun..."
|
||||||
"$UPX_BIN" sync public/ / -w 10 --delete --strong
|
timeout 480 "$UPX_BIN" sync public/ / -w 10 --delete --strong
|
||||||
"$UPX_BIN" put public/.build_hash /__build_hash
|
timeout 30 "$UPX_BIN" put public/.build_hash /__build_hash
|
||||||
echo "✅ UpYun 上传完成"
|
echo "✅ UpYun 上传完成"
|
||||||
echo "skipped=false" >> $GITHUB_OUTPUT
|
echo "skipped=false" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user