Merge branch 'develop'

Author: xxcheng123

.github/workflows/docker-image.yml

@@ -19,37 +19,50 @@ jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v2
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      -
-        name: Login to DockerHub
-        uses: docker/login-action@v1
+      - name: 📥 Checkout
+        uses: actions/checkout@v4
+
+      - name: 🔧 Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: 🔧 Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: 🔑 Login to DockerHub
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Generate App Version
-        run: echo APP_VERSION=`git describe --tags --always` >> $GITHUB_ENV
-      -
-        name: Build and push
-        uses: docker/build-push-action@v2
+
+      - name: 📊 Generate App Version
+        run: |
+          if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
+            echo "APP_VERSION=${{ github.event.inputs.tag }}" >> $GITHUB_ENV
+          else
+            echo "APP_VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
+          fi
+
+      - name: 🔨 Build and push
+        uses: docker/build-push-action@v5
         with:
           context: .
-          platforms: |
-            linux/386
-            linux/amd64
-            linux/arm64
+          platforms: linux/amd64,linux/arm64  # 移除 linux/386
           push: true
           build-args: |
             APP_NAME=${{ env.APP_NAME }}
             APP_VERSION=${{ env.APP_VERSION }}
           tags: |
             ${{ env.DOCKERHUB_REPO }}:latest
-            ${{ env.DOCKERHUB_REPO }}:${{ env.APP_VERSION }}
+            ${{ env.DOCKERHUB_REPO }}:${{ env.APP_VERSION }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      - name: 📋 Docker Image Info
+        run: |
+          echo "🎉 Docker 镜像构建完成！"
+          echo "📦 镜像标签:"
+          echo "  - ${{ env.DOCKERHUB_REPO }}:latest"
+          echo "  - ${{ env.DOCKERHUB_REPO }}:${{ env.APP_VERSION }}"
+          echo ""
+          echo "🚀 使用方法:"
+          echo "  docker run -p 12395:12395 ${{ env.DOCKERHUB_REPO }}:latest"

.github/workflows/github-release.yml

@@ -335,20 +335,36 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           path: artifacts
-          merge-multiple: true
 
-      - name: 📋 验证下载的文件
+      - name: 🔧 整理发布文件
         run: |
-          echo "📋 已下载的产物："
-          find artifacts -type f -name "*.tar.gz" -o -name "*.zip" | sort
-          echo ""
-          echo "📊 文件大小和校验和："
-          find artifacts -type f -name "*.tar.gz" -o -name "*.zip" | while read file; do
-            echo "文件: $(basename "$file")"
-            echo "  大小: $(ls -lh "$file" | awk '{print $5}')"
-            echo "  SHA256: $(sha256sum "$file" | cut -d' ' -f1)"
-            echo ""
+          echo "🔧 整理发布文件..."
+          
+          # 创建发布目录
+          mkdir -p release-files
+          
+          # 查看下载的文件结构
+          echo "📋 下载的文件结构："
+          find artifacts -type f | sort
+          
+          # 移动所有压缩包到发布目录
+          find artifacts -name "*.tar.gz" -o -name "*.zip" | while read file; do
+            filename=$(basename "$file")
+            echo "📦 移动文件: $filename"
+            cp "$file" "release-files/$filename"
           done
+          
+          # 验证发布文件
+          echo "📊 准备发布的文件："
+          ls -la release-files/
+          
+          # 生成校验和文件
+          cd release-files
+          echo "🔐 生成校验和..."
+          sha256sum *.tar.gz *.zip > SHA256SUMS 2>/dev/null || true
+          
+          echo "📋 校验和文件内容："
+          cat SHA256SUMS || echo "未生成校验和文件"
 
       - name: 📋 创建 GitHub 发布
         uses: softprops/action-gh-release@v2