Compare commits
15 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 35e0152815 | |||
| 53ea848582 | |||
| a9b04b6960 | |||
| 67a8c79dbd | |||
| 1a720443db | |||
| 3686f1d03f | |||
| f003c4367e | |||
| d3945d7234 | |||
| 52e9dd5561 | |||
| e20d8e47ce | |||
| 468cf69d60 | |||
| b895d62260 | |||
| 8aa417989e | |||
| 3d8bee740c | |||
| fc7dc5ff4d |
@@ -0,0 +1,62 @@
|
|||||||
|
# Gitea Runner 自主维护配置指南
|
||||||
|
|
||||||
|
## 当前状态
|
||||||
|
- Runner 名称: gitea-runner (online, label: docker)
|
||||||
|
- 维护 workflow: `.gitea/workflows/runner-maintenance.yaml` (每 6 小时 + 手动触发)
|
||||||
|
|
||||||
|
## 宿主机 docker-compose 推荐配置
|
||||||
|
|
||||||
|
在 fnOS 上找到 gitea-runner 的 compose 文件,确保包含以下配置:
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
services:
|
||||||
|
gitea:
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD", "curl", "-f", "http://localhost:3000/api/healthz"]
|
||||||
|
interval: 10s
|
||||||
|
retries: 3
|
||||||
|
start_period: 30s
|
||||||
|
timeout: 10s
|
||||||
|
|
||||||
|
gitea-runner:
|
||||||
|
image: gitea/act_runner:latest
|
||||||
|
container_name: gitea-runner
|
||||||
|
restart: unless-stopped
|
||||||
|
depends_on:
|
||||||
|
gitea:
|
||||||
|
condition: service_healthy
|
||||||
|
restart: true
|
||||||
|
volumes:
|
||||||
|
- ./runner-data:/data
|
||||||
|
- /var/run/docker.sock:/var/run/docker.sock
|
||||||
|
environment:
|
||||||
|
- GITEA_INSTANCE_URL=https://gitea.windychen00n.work
|
||||||
|
- GITEA_RUNNER_JOB_CONTAINER_NETWORK=<gitea所在docker网络名>
|
||||||
|
# 首次注册时需要,之后可删除
|
||||||
|
# - GITEA_RUNNER_REGISTRATION_TOKEN=<token>
|
||||||
|
networks:
|
||||||
|
- <gitea所在docker网络名>
|
||||||
|
|
||||||
|
networks:
|
||||||
|
<gitea所在docker网络名>:
|
||||||
|
external: true
|
||||||
|
```
|
||||||
|
|
||||||
|
## 查找 docker 网络名
|
||||||
|
|
||||||
|
在 fnOS SSH 执行:
|
||||||
|
```bash
|
||||||
|
docker inspect gitea --format "{{range $k,$v := .NetworkSettings.Networks}}{{$k}}{{end}}"
|
||||||
|
docker inspect gitea-runner --format "{{range $k,$v := .NetworkSettings.Networks}}{{$k}}{{end}}"
|
||||||
|
```
|
||||||
|
|
||||||
|
将 `GITEA_RUNNER_JOB_CONTAINER_NETWORK` 设为 gitea 容器所在的网络名,
|
||||||
|
这样 CI job 容器才能通过 `http://gitea:3000` 和 `http://verdaccio:4873` 访问内网服务。
|
||||||
|
|
||||||
|
## 应用后验证
|
||||||
|
|
||||||
|
```bash
|
||||||
|
docker compose up -d gitea-runner
|
||||||
|
```
|
||||||
|
|
||||||
|
然后在 Gitea 页面手动触发 "Runner Self-Maintenance" workflow,应全部通过。
|
||||||
@@ -10,10 +10,13 @@ jobs:
|
|||||||
runs-on: docker
|
runs-on: docker
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
|
env:
|
||||||
|
GIT_AUTH: ${{ secrets.CI_USER }}:${{ secrets.CI_PASSWORD }}
|
||||||
run: |
|
run: |
|
||||||
git init
|
git init
|
||||||
git remote add origin http://gitea:3000/windychen/windyChenUtils.git
|
git remote add origin http://gitea:3000/windychen/windychen-utils.git
|
||||||
git fetch --depth 1 origin ${{ github.sha }}
|
AUTH_B64=$(printf '%s' "$GIT_AUTH" | base64 | tr -d '\n')
|
||||||
|
git -c http.extraHeader="Authorization: Basic ${AUTH_B64}" fetch --depth 1 origin ${{ github.sha }}
|
||||||
git checkout ${{ github.sha }}
|
git checkout ${{ github.sha }}
|
||||||
|
|
||||||
- name: Setup npm for Verdaccio
|
- name: Setup npm for Verdaccio
|
||||||
@@ -46,10 +49,13 @@ jobs:
|
|||||||
|
|
||||||
- name: Publish to Gitea
|
- name: Publish to Gitea
|
||||||
id: publish-gitea
|
id: publish-gitea
|
||||||
|
env:
|
||||||
|
GITEA_NPM_AUTH: ${{ secrets.CI_USER }}:${{ secrets.NPM_GITEA_TOKEN }}
|
||||||
run: |
|
run: |
|
||||||
npm config set //gitea:3000/api/packages/windychen/npm/:_authToken ${{ secrets.NPM_GITEA_TOKEN }}
|
AUTH_B64=$(printf '%s' "$GITEA_NPM_AUTH" | base64 | tr -d '\n')
|
||||||
|
npm config set //gitea:3000/api/packages/windychen/npm/:_auth "$AUTH_B64"
|
||||||
VERSION=$(node -p "require('./package.json').version")
|
VERSION=$(node -p "require('./package.json').version")
|
||||||
EXISTS=$(curl -s "http://gitea:3000/api/v1/packages/windychen?q=windychen-utils" -H "Authorization: token ${{ secrets.NPM_GITEA_TOKEN }}" | grep -c "\"version\":\"$VERSION\"" || true)
|
EXISTS=$(curl -s "http://gitea:3000/api/v1/packages/windychen?q=windychen-utils" -u "${{ secrets.CI_USER }}:${{ secrets.CI_PASSWORD }}" | grep -c "\"version\":\"$VERSION\"" || true)
|
||||||
if [ "$EXISTS" -gt 0 ]; then
|
if [ "$EXISTS" -gt 0 ]; then
|
||||||
echo "Gitea: version $VERSION already exists, skipping."
|
echo "Gitea: version $VERSION already exists, skipping."
|
||||||
echo "gitea_result=skipped|版本 ${VERSION} 已存在" >> $GITHUB_OUTPUT
|
echo "gitea_result=skipped|版本 ${VERSION} 已存在" >> $GITHUB_OUTPUT
|
||||||
@@ -66,11 +72,11 @@ jobs:
|
|||||||
if: always() && steps.publish-gitea.outcome == 'success'
|
if: always() && steps.publish-gitea.outcome == 'success'
|
||||||
run: |
|
run: |
|
||||||
VERSION=$(node -p "require('./package.json').version")
|
VERSION=$(node -p "require('./package.json').version")
|
||||||
EXISTS=$(curl -s "http://gitea:3000/api/v1/repos/windychen/windyChenUtils/releases/tags/v${VERSION}" -H "Authorization: token ${{ secrets.NPM_GITEA_TOKEN }}" | grep -c "\"tag_name\"" || true)
|
EXISTS=$(curl -s "http://gitea:3000/api/v1/repos/windychen/windychen-utils/releases/tags/v${VERSION}" -u "${{ secrets.CI_USER }}:${{ secrets.CI_PASSWORD }}" | grep -c "\"tag_name\"" || true)
|
||||||
if [ "$EXISTS" = "0" ]; then
|
if [ "$EXISTS" = "0" ]; then
|
||||||
curl -s -X POST \
|
curl -s -X POST \
|
||||||
"http://gitea:3000/api/v1/repos/windychen/windyChenUtils/releases" \
|
"http://gitea:3000/api/v1/repos/windychen/windychen-utils/releases" \
|
||||||
-H "Authorization: token ${{ secrets.NPM_GITEA_TOKEN }}" \
|
-u "${{ secrets.CI_USER }}:${{ secrets.CI_PASSWORD }}" \
|
||||||
-H "Content-Type: application/json" \
|
-H "Content-Type: application/json" \
|
||||||
-d "{\"tag_name\":\"v${VERSION}\",\"name\":\"v${VERSION}\",\"body\":\"## windychen-utils v${VERSION}\n\n- 发布到 Verdaccio\n- 发布到 Gitea Packages\",\"target_commitish\":\"main\"}"
|
-d "{\"tag_name\":\"v${VERSION}\",\"name\":\"v${VERSION}\",\"body\":\"## windychen-utils v${VERSION}\n\n- 发布到 Verdaccio\n- 发布到 Gitea Packages\",\"target_commitish\":\"main\"}"
|
||||||
else
|
else
|
||||||
@@ -119,4 +125,4 @@ jobs:
|
|||||||
|
|
||||||
curl -s -X POST "https://oapi.dingtalk.com/robot/send?access_token=${{ secrets.DINGDING_TOKEN }}" \
|
curl -s -X POST "https://oapi.dingtalk.com/robot/send?access_token=${{ secrets.DINGDING_TOKEN }}" \
|
||||||
-H "Content-Type: application/json" \
|
-H "Content-Type: application/json" \
|
||||||
-d "{\"msgtype\":\"markdown\",\"markdown\":{\"title\":\"${TITLE}\",\"text\":\"## ${TITLE}\n\n${VERD_LINE}\n${GITEA_LINE}\n\n- 仓库: windychen/windyChenUtils\n- 分支: ${{ github.ref_name }}\n- 提交: ${{ github.sha }}\"}}"
|
-d "{\"msgtype\":\"markdown\",\"markdown\":{\"title\":\"${TITLE}\",\"text\":\"## ${TITLE}\n\n${VERD_LINE}\n${GITEA_LINE}\n\n- 仓库: windychen/windychen-utils\n- 分支: ${{ github.ref_name }}\n- 提交: ${{ github.sha }}\"}}"
|
||||||
|
|||||||
@@ -0,0 +1,72 @@
|
|||||||
|
name: Runner Self-Maintenance
|
||||||
|
|
||||||
|
on:
|
||||||
|
schedule:
|
||||||
|
- cron: "0 */6 * * *"
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
health-check:
|
||||||
|
runs-on: docker
|
||||||
|
steps:
|
||||||
|
- name: Install tools
|
||||||
|
run: |
|
||||||
|
if command -v apk >/dev/null 2>&1; then
|
||||||
|
apk add --no-cache curl grep
|
||||||
|
elif command -v apt-get >/dev/null 2>&1; then
|
||||||
|
apt-get update -qq && apt-get install -y -qq curl grep
|
||||||
|
else
|
||||||
|
echo "No supported package manager"; exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
- name: Check Gitea health
|
||||||
|
id: gitea
|
||||||
|
run: |
|
||||||
|
BODY=$(curl -sf --connect-timeout 15 "https://gitea.windychen00n.work/api/healthz")
|
||||||
|
if echo "$BODY" | grep -qE '"status"[[:space:]]*:[[:space:]]*"pass"'; then
|
||||||
|
echo "result=ok|Gitea 健康检查通过" >> $GITHUB_OUTPUT
|
||||||
|
else
|
||||||
|
echo "result=fail|Gitea 健康检查失败" >> $GITHUB_OUTPUT
|
||||||
|
echo "$BODY" | head -3
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
- name: Check Verdaccio health
|
||||||
|
id: verdaccio
|
||||||
|
continue-on-error: true
|
||||||
|
run: |
|
||||||
|
if curl -sf --connect-timeout 5 "http://172.172.2.4:4873/-/ping" >/dev/null 2>&1; then
|
||||||
|
echo "result=ok|Verdaccio 内网可达" >> $GITHUB_OUTPUT
|
||||||
|
elif curl -sf --connect-timeout 5 "http://verdaccio:4873/-/ping" >/dev/null 2>&1; then
|
||||||
|
echo "result=ok|Verdaccio DNS 可达" >> $GITHUB_OUTPUT
|
||||||
|
else
|
||||||
|
echo "result=warn|Verdaccio 内网不可达(需配置 runner job 网络)" >> $GITHUB_OUTPUT
|
||||||
|
fi
|
||||||
|
|
||||||
|
- name: Check runner registration
|
||||||
|
id: runner
|
||||||
|
run: |
|
||||||
|
RESP=$(curl -sf --connect-timeout 15 -u "${{ secrets.CI_USER }}:${{ secrets.CI_PASSWORD }}" \
|
||||||
|
"https://gitea.windychen00n.work/api/v1/admin/actions/runners")
|
||||||
|
ONLINE=$(echo "$RESP" | grep -c '"status":"online"' || true)
|
||||||
|
if [ "${ONLINE:-0}" -ge 1 ]; then
|
||||||
|
NAME=$(echo "$RESP" | grep -o '"name":"[^"]*"' | head -1 | cut -d'"' -f4)
|
||||||
|
echo "result=ok|Runner ${NAME} 在线 (${ONLINE} 个)" >> $GITHUB_OUTPUT
|
||||||
|
else
|
||||||
|
echo "result=fail|无在线 Runner" >> $GITHUB_OUTPUT
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
- name: Notify DingTalk on failure
|
||||||
|
if: failure()
|
||||||
|
run: |
|
||||||
|
curl -s -X POST "https://oapi.dingtalk.com/robot/send?access_token=${{ secrets.DINGDING_TOKEN }}" \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-d '{"msgtype":"markdown","markdown":{"title":"❌ Gitea Runner 自主维护告警 chen-fnos","text":"## ❌ Gitea Runner 自主维护告警 chen-fnos\n\n- Gitea: ${{ steps.gitea.outputs.result }}\n- Verdaccio: ${{ steps.verdaccio.outputs.result }}\n- Runner: ${{ steps.runner.outputs.result }}\n\n请检查 gitea-runner 容器"}}'
|
||||||
|
|
||||||
|
- name: Notify DingTalk on success
|
||||||
|
if: success()
|
||||||
|
run: |
|
||||||
|
curl -s -X POST "https://oapi.dingtalk.com/robot/send?access_token=${{ secrets.DINGDING_TOKEN }}" \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-d '{"msgtype":"markdown","markdown":{"title":"✅ Gitea Runner 自主维护正常 chen-fnos","text":"## ✅ Gitea Runner 自主维护正常 chen-fnos\n\n- Gitea: ${{ steps.gitea.outputs.result }}\n- Verdaccio: ${{ steps.verdaccio.outputs.result }}\n- Runner: ${{ steps.runner.outputs.result }}"}}'
|
||||||
@@ -99,3 +99,5 @@ npm test # 运行测试
|
|||||||
## License
|
## License
|
||||||
|
|
||||||
ISC
|
ISC
|
||||||
|
<!-- ci-test-marker -->
|
||||||
|
<!-- ci-test-marker-3 -->
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "windychen-utils",
|
"name": "windychen-utils",
|
||||||
"version": "1.1.12",
|
"version": "1.1.13",
|
||||||
"main": "dist/windychen-utils.cjs.js",
|
"main": "dist/windychen-utils.cjs.js",
|
||||||
"module": "dist/windychen-utils.esm.js",
|
"module": "dist/windychen-utils.esm.js",
|
||||||
"browser": "dist/windychen-utils.js",
|
"browser": "dist/windychen-utils.js",
|
||||||
|
|||||||
Reference in New Issue
Block a user