From 01793320136f69c27d1a8252a82d6119735f3dee Mon Sep 17 00:00:00 2001 From: truewhile <62226914+truewhile@users.noreply.github.com> Date: Sat, 5 Sep 2026 18:14:53 +0800 Subject: [PATCH] =?UTF-8?q?CI=E6=94=B9=E9=80=A0=EF=BC=9A=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7=E6=94=B9=E4=B8=BAtag=E9=A9=B1=E5=8A=A8=EF=BC=8C?= =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=AF=8F=E6=AC=A1push=E5=9B=9E=E5=86=99VERSI?= =?UTF-8?q?ON=E7=9A=84bump=E6=8F=90=E4=BA=A4=EF=BC=8C=E6=B6=88=E9=99=A4?= =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E6=8E=A8=E9=80=81=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/Auto-docker-publish.yml | 159 +++++++--------------- 1 file changed, 50 insertions(+), 109 deletions(-) diff --git a/.github/workflows/Auto-docker-publish.yml b/.github/workflows/Auto-docker-publish.yml index bf98c57..e25e2c6 100644 --- a/.github/workflows/Auto-docker-publish.yml +++ b/.github/workflows/Auto-docker-publish.yml @@ -1,122 +1,56 @@ -name: AuTo Docker Image - +name: Build & Publish +# 版本策略（无回写）： +# - push 到 main：发布 latest 镜像并部署服务器，CI 不再修改 VERSION / 不再向 main 提交 bump， +# 本地与远程永远不会因 CI 抢提交而产生推送冲突。 +# - push tag v*：正式发版，按 tag 名发布版本镜像、GitHub Release 与多平台二进制。 +# - 手动触发：等同正式发版，版本号取 VERSION 文件当前内容。 +# 需要发正式版时：修改 VERSION（可选）→ git tag v1.2.3 → git push origin v1.2.3 on: push: branches: [main] + tags: ['v*'] - # 保留手动触发作为备选 workflow_dispatch: - inputs: - version_type: - description: '版本递增类型' - required: true - default: 'patch' - type: choice - options: - - patch # 0.0.x - - minor # 0.x.0 - - major # x.0.0 permissions: - contents: write # 需要写入权限来更新版本文件 + contents: write # 发布 Release 与上传二进制需要 packages: write jobs: - version-and-publish: + build-image: runs-on: ubuntu-latest outputs: - new_version: ${{ steps.bump_version.outputs.new_version }} - tag: ${{ steps.bump_version.outputs.tag }} + version: ${{ steps.version.outputs.version }} + release_tag: ${{ steps.version.outputs.release_tag }} + is_release: ${{ steps.version.outputs.is_release }} steps: - uses: actions/checkout@v4 - with: - fetch-depth: 0 # 获取完整历史以便版本计算 - token: ${{ secrets.GITHUB_TOKEN }} - # 1. 获取或初始化版本号 - - name: Get current version - id: get_version + # 1. 解析版本号：tag 触发取 tag 名（去掉 v 前缀），其余场景读 VERSION 文件 + - name: Resolve version + id: version run: | - # 从文件读取版本号，或使用默认值 - if [ -f VERSION ]; then - CURRENT_VERSION=$(cat VERSION) + if [[ "${{ github.ref_type }}" = "tag" ]]; then + VERSION="${GITHUB_REF_NAME#v}" else - CURRENT_VERSION="0.0.0" - echo $CURRENT_VERSION > VERSION + VERSION=$(cat VERSION 2>/dev/null || echo "0.0.0") fi - echo "current_version=$CURRENT_VERSION" >> $GITHUB_OUTPUT - - # 分离版本组成部分 - MAJOR=$(echo $CURRENT_VERSION | cut -d. -f1) - MINOR=$(echo $CURRENT_VERSION | cut -d. -f2) - PATCH=$(echo $CURRENT_VERSION | cut -d. -f3) - echo "major=$MAJOR" >> $GITHUB_OUTPUT - echo "minor=$MINOR" >> $GITHUB_OUTPUT - echo "patch=$PATCH" >> $GITHUB_OUTPUT - - # 2. 计算新版本号 - - name: Bump version - id: bump_version - run: | - MAJOR=${{ steps.get_version.outputs.major }} - MINOR=${{ steps.get_version.outputs.minor }} - PATCH=${{ steps.get_version.outputs.patch }} - - # 手动触发时根据选择递增 - if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then - TYPE="${{ github.event.inputs.version_type }}" - if [ "$TYPE" = "major" ]; then - MAJOR=$((MAJOR + 1)) - MINOR=0 - PATCH=0 - elif [ "$TYPE" = "minor" ]; then - MINOR=$((MINOR + 1)) - PATCH=0 - else # patch - PATCH=$((PATCH + 1)) - fi + # 手动触发视为正式发版；日常 push main 仅滚动 latest + if [ "${{ github.event_name }}" = "workflow_dispatch" ] || [[ "${{ github.ref_type }}" = "tag" ]]; then + IS_RELEASE=true else - # 自动触发时默认 patch 递增 - PATCH=$((PATCH + 1)) + IS_RELEASE=false fi - - NEW_VERSION="${MAJOR}.${MINOR}.${PATCH}" - echo "new_version=$NEW_VERSION" >> $GITHUB_OUTPUT - echo "tag=MeBox-v${NEW_VERSION}" >> $GITHUB_OUTPUT - echo "tag=mebox-v${NEW_VERSION}" >> $GITHUB_OUTPUT + echo "version=${VERSION}" >> "$GITHUB_OUTPUT" + echo "release_tag=mebox-v${VERSION}" >> "$GITHUB_OUTPUT" + echo "is_release=${IS_RELEASE}" >> "$GITHUB_OUTPUT" - # 3. 更新 VERSION 文件 - - name: Update version file - run: | - echo "${{ steps.bump_version.outputs.new_version }}" > VERSION - - # 如果存在 go.mod，也更新其中的版本（可选） - # if [ -f go.mod ]; then - # sed -i "s/^version .*/version ${{ steps.bump_version.outputs.new_version }}/" go.mod - # fi - - # 4. 提交版本变更 - - name: Commit version bump - run: | - git config user.name "github-actions[bot]" - git config user.email "github-actions[bot]@users.noreply.github.com" - git add VERSION - git commit -m "chore: bump version to ${{ steps.bump_version.outputs.new_version }} [skip ci]" - git push - - # 5. 创建 Git Tag - - name: Create and push tag - run: | - TAG="${{ steps.bump_version.outputs.tag }}" - git tag $TAG - git push origin $TAG - - # 6. 设置 Docker QEMU 和 Buildx + # 2. 设置 Docker QEMU 和 Buildx - uses: docker/setup-qemu-action@v3 - uses: docker/setup-buildx-action@v3 - # 7. 登录 GHCR + # 3. 登录 GHCR - name: Log in to GHCR uses: docker/login-action@v3 with: @@ -124,7 +58,7 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - # 8. 提取镜像元数据 + # 4. 提取镜像元数据 - name: Extract image metadata id: meta uses: docker/metadata-action@v5 @@ -132,10 +66,9 @@ jobs: images: ghcr.io/${{ github.repository_owner }}/mebox tags: | type=raw,value=latest - type=raw,value=${{ steps.bump_version.outputs.tag }} - type=raw,value=${{ steps.bump_version.outputs.new_version }} + type=raw,value=${{ steps.version.outputs.version }} - # 9. 构建并推送 + # 5. 构建并推送 - name: Build & push uses: docker/build-push-action@v6 with: @@ -147,13 +80,16 @@ jobs: tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} build-args: | - VERSION=${{ steps.bump_version.outputs.new_version }} + VERSION=${{ steps.version.outputs.release_tag }} cache-from: type=gha cache-to: type=gha,mode=max # 单文件可执行构建：把前端打包进二进制（go:embed），交叉编译 Windows / # Linux / macOS 的 amd64 / arm64 产物，作为 GitHub Release 附件发布。 + # 仅正式发版（tag v* 或手动触发）时执行。 build-frontend: + if: needs.build-image.outputs.is_release == 'true' + needs: [build-image] runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -178,7 +114,8 @@ jobs: # 先创建（幂等）空的 GitHub Release，供后续 build-binaries 并行上传附件， # 也避免矩阵各 job 并发 upload 时 release 尚不存在而互相竞争。 publish-create-release: - needs: [version-and-publish] + if: needs.build-image.outputs.is_release == 'true' + needs: [build-image] runs-on: ubuntu-latest permissions: contents: write @@ -187,17 +124,22 @@ jobs: - name: Create release env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - RELEASE_TAG: ${{ needs.version-and-publish.outputs.tag }} + RELEASE_TAG: ${{ needs.build-image.outputs.release_tag }} run: | set -eux - # tag 已由 version-and-publish 推送；若 release 已存在则忽略（--verify-tag 幂等） + # tag push 时 tag 已存在；手动触发时基于当前 main 创建 tag（幂等） + if ! git rev-parse "$RELEASE_TAG" >/dev/null 2>&1; then + git tag "$RELEASE_TAG" + git push origin "$RELEASE_TAG" + fi gh release create "$RELEASE_TAG" \ - --title "MeBox ${{ needs.version-and-publish.outputs.new_version }}" \ - --notes "自动化发布 ${{ needs.version-and-publish.outputs.new_version }}" \ + --title "MeBox ${{ needs.build-image.outputs.version }}" \ + --notes "自动化发布 ${{ needs.build-image.outputs.version }}" \ --verify-tag --latest || true build-binaries: - needs: [version-and-publish, build-frontend, publish-create-release] + if: needs.build-image.outputs.is_release == 'true' + needs: [build-image, build-frontend, publish-create-release] runs-on: ubuntu-latest permissions: contents: write @@ -237,7 +179,7 @@ jobs: - name: Build binary run: | CGO_ENABLED=0 GOOS=${{ matrix.goos }} GOARCH=${{ matrix.goarch }} \ - go build -trimpath -ldflags="-s -w -X main.version=${{ needs.version-and-publish.outputs.tag }}" \ + go build -trimpath -ldflags="-s -w -X main.version=${{ needs.build-image.outputs.release_tag }}" \ -o "dist/mebox-${{ matrix.goos }}-${{ matrix.goarch }}${{ matrix.ext }}" ./cmd/server - name: Package run: | @@ -252,7 +194,7 @@ jobs: - name: Upload to GitHub Release env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - RELEASE_TAG: ${{ needs.version-and-publish.outputs.tag }} + RELEASE_TAG: ${{ needs.build-image.outputs.release_tag }} run: | set -eux PKG="mebox_${{ matrix.goos }}_${{ matrix.goarch }}.zip" @@ -267,7 +209,7 @@ jobs: deploy: name: Deploy to Server - needs: [version-and-publish] + needs: [build-image] runs-on: ubuntu-latest steps: - name: Deploy via SSH @@ -302,4 +244,3 @@ jobs: docker image prune -f echo "==== 部署完成并已启动 ====" -