添加deb包构建，删除容器构建

2025-12-03 16:10:42 +08:00
parent 8100b2f2e5
commit 9142021f26
10 changed files with 370 additions and 208 deletions
--- a/.gitea/workflows/ci.yaml
+++ b/.gitea/workflows/ci.yaml
@@ -9,7 +9,7 @@ on:
 env:
  DOCKER_BUILDKIT: "1"
  PRODUCT_NAME: "xxxigcc"
-  PACKAGE_VERSION: "3.4.6-xg2"
+  PACKAGE_VERSION: "3.4.6-xg1"
  BUILDX_NO_DEFAULT_ATTESTATIONS: "1"

 jobs:
@@ -70,85 +70,28 @@ jobs:
          test/xxxigDaemon --version 2>/dev/null || echo "⚠️ 跳过版本检查"
          rm -rf test

+      - name: Build Debian package
+        if: matrix.distro == 'ubuntu'
+        run: |
+          # 安装 dpkg-deb（如果需要）
+          sudo apt-get update && sudo apt-get install -y dpkg-dev
+
+          TARGZ="${PRODUCT_NAME}-${{ matrix.arch }}-${{ matrix.distro }}-${PACKAGE_VERSION}.tar.gz"
+
+          echo "📦 Building Debian package for ${{ matrix.arch }}..."
+          chmod +x debian/build-deb.sh
+          ./debian/build-deb.sh ${{ matrix.arch }} ${PACKAGE_VERSION} "${TARGZ}"
+
+          ls -lh *.deb
+
      - uses: https://github.com/ChristopherHX/gitea-upload-artifact@v4
        with:
          name: binaries-${{ matrix.arch }}-${{ matrix.distro }}
-          path: "*.tar.gz"
+          path: |
+            *.tar.gz
+            *.deb
          retention-days: 1

-  docker-images:
-    runs-on: ubuntu-latest-amd64
-    needs: build-and-test
-    if: github.ref_name == 'main' || github.ref_name == 'develop' || startsWith(github.ref, 'refs/tags/')
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Debug branch info
-        run: |
-          echo "📋 Branch Information:"
-          echo "  github.ref: ${{ github.ref }}"
-          echo "  github.ref_name: ${{ github.ref_name }}"
-          echo "  github.event_name: ${{ github.event_name }}"
-
-      - uses: https://github.com/ChristopherHX/gitea-download-artifact@v4
-        with:
-          pattern: binaries-*
-          path: ./app
-          merge-multiple: true
-
-      - name: Setup Docker and Login
-        run: |
-          # 尝试设置 QEMU，忽略错误
-          docker run --rm --privileged multiarch/qemu-user-static --reset -p yes 2>/dev/null || true
-
-          # 创建 buildx builder，增加资源限制和优化参数
-          docker buildx create --use --name multiarch-builder \
-            --driver docker-container \
-            --driver-opt network=host \
-            --driver-opt env.BUILDKIT_STEP_LOG_MAX_SIZE=50000000 \
-            --driver-opt env.BUILDKIT_STEP_LOG_MAX_SPEED=10000000 \
-            --buildkitd-flags '--allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host' \
-            || true
-          docker buildx inspect --bootstrap
-
-          # 登录
-          echo "${{ secrets.BUILD_TOKEN }}" | docker login ${{ gitea.server_url }} -u ${{ gitea.actor }} --password-stdin
-
-      - name: Determine Docker tag
-        id: tag
-        run: |
-          if [ "${{ github.ref_name }}" = "main" ]; then
-            TAG="latest"
-          elif [ "${{ github.ref_name }}" = "develop" ]; then
-            TAG="develop"
-          elif [[ "${{ github.ref }}" == refs/tags/* ]]; then
-            TAG="${{ github.ref_name }}"
-          else
-            TAG="${{ github.ref_name }}"
-          fi
-          echo "tag=${TAG}" >> $GITHUB_OUTPUT
-          echo "📦 Docker tag: ${TAG}"
-
-      - name: Build and push Docker images
-        run: |
-          # 移除 URL 中的 https:// 前缀
-          REGISTRY=$(echo "${{ gitea.server_url }}" | sed 's|https\?://||')/${{ gitea.repository }}
-          TAG="${{ steps.tag.outputs.tag }}"
-
-          echo "📦 Docker Registry: ${REGISTRY}"
-          echo "📦 Docker Tag: ${TAG}"
-
-          BUILD_ARGS="--pull --push --platform linux/amd64,linux/arm64 \
-            --build-arg TARGZ_FILE_AMD64=${PRODUCT_NAME}-amd64-alpine-${PACKAGE_VERSION}.tar.gz \
-            --build-arg TARGZ_FILE_ARM64=${PRODUCT_NAME}-arm64-alpine-${PACKAGE_VERSION}.tar.gz \
-            --provenance=false --sbom=false"
-
-          echo "🐳 Building server image..."
-          docker buildx build $BUILD_ARGS -t "${REGISTRY}/server:${TAG}" -f docker/Dockerfile.Server .
-
-          echo "🐳 Building daemon image..."
-          docker buildx build $BUILD_ARGS -t "${REGISTRY}/daemon:${TAG}" -f docker/Dockerfile.Daemon .
-
  release:
    runs-on: ubuntu-latest-amd64
    needs: build-and-test
@@ -178,7 +121,7 @@ jobs:
          echo "  Package: ${PRODUCT_NAME}"
          echo "  Version: ${TAG}"

-          # 上传所有包到 Generic Package Registry
+          # 上传所有 tar.gz 包到 Generic Package Registry
          for file in *.tar.gz; do
            [ ! -f "$file" ] && continue
            echo "  ⬆️  $file"
@@ -191,18 +134,40 @@ jobs:
            }
          done

-          # 生成 Release 描述（包含 Package Registry 和 Release 附件两种下载方式）
+          # 上传 Debian 包到 Debian Package Registry (支持多个发行版)
          echo ""
-          echo "📝 生成 Release 描述..."
-          BODY="## Release ${TAG}\n\n"
-          BODY="${BODY}### 📥 下载方式\n\n"
-          BODY="${BODY}#### 方式 1: 直接下载（推荐）\n\n"
-          BODY="${BODY}点击下面 **Assets** 部分的文件名直接下载。\n\n"
-          BODY="${BODY}#### 方式 2: Package Registry\n\n"
-          for file in *.tar.gz; do
-            [ -f "$file" ] && BODY="${BODY}- [\`${file}\`](https://${REGISTRY}/api/packages/${OWNER}/generic/${PRODUCT_NAME}/${TAG}/${file})\n"
+          echo "📦 上传 Debian 包到 Debian Package Registry..."
+          for file in *.deb; do
+            [ ! -f "$file" ] && continue
+
+            # 上传到 bookworm (Debian 12)
+            echo "  ⬆️  $file → bookworm"
+            curl -fsSL -X PUT \
+              -H "Authorization: token ${TOKEN}" \
+              --upload-file "$file" \
+              "https://${REGISTRY}/api/packages/${OWNER}/debian/pool/bookworm/main/upload" || {
+              echo "❌ Debian 包上传失败: $file (bookworm)"
+              exit 1
+            }
+
+            # 上传到 trixie (Debian 13)
+            echo "  ⬆️  $file → trixie"
+            curl -fsSL -X PUT \
+              -H "Authorization: token ${TOKEN}" \
+              --upload-file "$file" \
+              "https://${REGISTRY}/api/packages/${OWNER}/debian/pool/trixie/main/upload" || {
+              echo "❌ Debian 包上传失败: $file (trixie)"
+              exit 1
+            }
          done

+          # 生成 Release JSON payload
+          echo ""
+          echo "📝 生成 Release..."
+
+          export REGISTRY OWNER TAG
+          RELEASE_DATA=$(python3 -c 'import json,glob,os;r=os.environ["REGISTRY"];o=os.environ["OWNER"];p=os.environ["PRODUCT_NAME"];t=os.environ["TAG"];b=["## Release "+t,"","### 📥 下载方式","","#### 方式 1: 直接下载（推荐）","","点击下面 **Assets** 部分的文件名直接下载。","","#### 方式 2: Generic Package Registry",""]+[f"- [`{f}`](https://{r}/api/packages/{o}/generic/{p}/{t}/{f})" for f in sorted(glob.glob("*.tar.gz"))]+["","#### 方式 3: Debian Repository","","**Debian 12 (bookworm):**","","```bash","# Download GPG key",f"sudo curl https://{r}/api/packages/{o}/debian/repository.key -o /etc/apt/keyrings/gitea-{o}.asc","","# Add repository",f"echo \"deb [signed-by=/etc/apt/keyrings/gitea-{o}.asc] https://{r}/api/packages/{o}/debian bookworm main\" | sudo tee -a /etc/apt/sources.list.d/{o}.list","","# Update and install","sudo apt-get update","sudo apt-get install xxxigcc","```","","**Debian 13 (trixie):**","","```bash","# Download GPG key",f"sudo curl https://{r}/api/packages/{o}/debian/repository.key -o /etc/apt/keyrings/gitea-{o}.asc","","# Add repository",f"echo \"deb [signed-by=/etc/apt/keyrings/gitea-{o}.asc] https://{r}/api/packages/{o}/debian trixie main\" | sudo tee -a /etc/apt/sources.list.d/{o}.list","","# Update and install","sudo apt-get update","sudo apt-get install xxxigcc","```"];print(json.dumps({"tag_name":t,"name":f"Release {t}","body":"\n".join(b),"draft":False,"prerelease":False}))')
+
          # 创建 Release
          echo ""
          echo "🎉 创建 Release..."
@@ -210,16 +175,7 @@ jobs:
            -H "Authorization: token ${TOKEN}" \
            -H "Content-Type: application/json" \
            "https://${REGISTRY}/api/v1/repos/${{ gitea.repository }}/releases" \
-            -d @- << EOF
-          {
-            "tag_name": "${TAG}",
-            "name": "Release ${TAG}",
-            "body": "${BODY}",
-            "draft": false,
-            "prerelease": false
-          }
-          EOF
-          )
+            -d "${RELEASE_DATA}")

          HTTP_CODE=$(echo "$RESPONSE" | tail -n1)
          RESPONSE_BODY=$(echo "$RESPONSE" | head -n-1)
@@ -244,7 +200,7 @@ jobs:
          # 上传文件作为 Release 附件
          echo ""
          echo "📎 上传文件作为 Release 附件..."
-          for file in *.tar.gz; do
+          for file in *.tar.gz *.deb; do
            [ ! -f "$file" ] && continue
            echo "  ⬆️  $file"

@@ -259,4 +215,7 @@ jobs:

          echo ""
          echo "✅ Release 创建完成！"
-          echo "🔗 访问: https://${REGISTRY}/${{ gitea.repository }}/releases/tag/${TAG}"
+          echo "🔗 访问: https://${REGISTRY}/${{ gitea.repository }}/releases/tag/${TAG}"
+
+          # 清理临时文件
+          rm -f release_body.md