Merge pull request 'fix:更新' (#11) from damer into main
Reviewed-on: #11
This commit was merged in pull request #11.
This commit is contained in:
@@ -6,13 +6,7 @@ on:
|
||||
|
||||
jobs:
|
||||
build-and-push:
|
||||
# 对应 Gitea Runner 的 label,可自定义
|
||||
runs-on: node,docker
|
||||
|
||||
# 使用带 Node 的官方容器来运行 job
|
||||
container:
|
||||
image: node:20-bullseye-slim
|
||||
options: --volume /var/run/docker.sock:/var/run/docker.sock
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
# 1️⃣ Checkout 仓库代码
|
||||
@@ -20,19 +14,24 @@ jobs:
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
# 需要能 push tag(请在仓库 Secrets 配置 RUNNER_TOKEN)
|
||||
token: ${{ secrets.RUNNER_TOKEN }}
|
||||
persist-credentials: true
|
||||
|
||||
# 2️⃣ 自动递增 tag 并推送回 Gitea 仓库
|
||||
# 2️⃣ 自动递增 tag 并推送回 Gitea 仓库(默认按 vX.Y.Z 的 patch +1)
|
||||
- name: Auto bump tag and push to repository
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
|
||||
# 配置提交信息(用于创建注释 tag)
|
||||
git config user.name "gitea-actions"
|
||||
git config user.email "actions@local"
|
||||
|
||||
# 确保本地有最新 tags
|
||||
git fetch --tags --force
|
||||
|
||||
# 取最新的 semver tag(vX.Y.Z),按版本号排序
|
||||
LATEST_TAG="$(git tag --list 'v*' --sort=-v:refname | head -n 1 || true)"
|
||||
echo "LATEST_TAG=${LATEST_TAG}"
|
||||
|
||||
@@ -45,12 +44,14 @@ jobs:
|
||||
PATCH="${BASH_REMATCH[3]}"
|
||||
NEXT_TAG="v${MAJOR}.${MINOR}.$((PATCH + 1))"
|
||||
else
|
||||
# 如果最新 tag 不符合 vX.Y.Z,回退到 v1.0.0,避免误解析
|
||||
NEXT_TAG="v1.0.0"
|
||||
fi
|
||||
fi
|
||||
|
||||
echo "NEXT_TAG=${NEXT_TAG}"
|
||||
|
||||
# 如果 tag 已存在则直接复用(避免重复运行失败)
|
||||
if git rev-parse -q --verify "refs/tags/${NEXT_TAG}" >/dev/null; then
|
||||
echo "Tag ${NEXT_TAG} 已存在,跳过创建。"
|
||||
else
|
||||
@@ -58,16 +59,27 @@ jobs:
|
||||
git push origin "${NEXT_TAG}"
|
||||
fi
|
||||
|
||||
echo "IMAGE_TAG=${NEXT_TAG}" >> "$GITHUB_ENV"
|
||||
echo "IMAGE_TAG=${NEXT_TAG}" >> "$GITEA_ENV"
|
||||
# 输出给后续步骤使用
|
||||
if [[ -n "${GITHUB_ENV:-}" ]]; then
|
||||
echo "IMAGE_TAG=${NEXT_TAG}" >> "$GITHUB_ENV"
|
||||
fi
|
||||
# 兼容部分 Gitea Runner 环境变量命名
|
||||
if [[ -n "${GITEA_ENV:-}" ]]; then
|
||||
echo "IMAGE_TAG=${NEXT_TAG}" >> "$GITEA_ENV"
|
||||
fi
|
||||
|
||||
# 3️⃣ 设置 Docker 镜像名称
|
||||
- name: Set image variables
|
||||
shell: bash
|
||||
run: |
|
||||
# 修改为你的 Docker Hub 仓库名,例如:yourname/mindfulness-server
|
||||
IMAGE_NAME=docker.damer.fun/damer/mindfulness-server
|
||||
echo "IMAGE_NAME=$IMAGE_NAME" >> "$GITHUB_ENV"
|
||||
echo "IMAGE_NAME=$IMAGE_NAME" >> "$GITEA_ENV"
|
||||
if [[ -n "${GITHUB_ENV:-}" ]]; then
|
||||
echo "IMAGE_NAME=$IMAGE_NAME" >> "$GITHUB_ENV"
|
||||
fi
|
||||
if [[ -n "${GITEA_ENV:-}" ]]; then
|
||||
echo "IMAGE_NAME=$IMAGE_NAME" >> "$GITEA_ENV"
|
||||
fi
|
||||
|
||||
# 4️⃣ 登录 Docker Hub
|
||||
- name: Login to Docker Hub
|
||||
@@ -76,13 +88,13 @@ jobs:
|
||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||
|
||||
# 5️⃣ 构建 Docker 镜像
|
||||
# 5️⃣ 构建 Docker 镜像(使用 server/ 作为构建上下文)
|
||||
- name: Build Docker Image
|
||||
shell: bash
|
||||
run: |
|
||||
docker build -f server/Dockerfile -t "$IMAGE_NAME:$IMAGE_TAG" server
|
||||
|
||||
# 6️⃣ 推送 Docker 镜像
|
||||
# 6️⃣ 推送 Docker 镜像到 Docker Hub
|
||||
- name: Push Docker Image
|
||||
shell: bash
|
||||
run: |
|
||||
|
||||
Reference in New Issue
Block a user