From dbad25ee736d9a16b1b973227bccbac73649db9c Mon Sep 17 00:00:00 2001 From: Wang Defa Date: Tue, 2 Dec 2025 12:14:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/ci.yaml | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml index c87139f..f3798b8 100644 --- a/.gitea/workflows/ci.yaml +++ b/.gitea/workflows/ci.yaml @@ -1,4 +1,4 @@ -# .gitea/workflows/demo.yaml +# .gitea/workflows/ci.yaml name: Build and Release on: @@ -23,8 +23,18 @@ jobs: - name: Setup Docker Buildx run: | - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes - docker buildx create --use --driver docker-container + # 尝试设置 QEMU,但忽略错误(宿主机可能已配置) + docker run --rm --privileged multiarch/qemu-user-static --reset -p yes 2>/dev/null || true + + # 验证 binfmt 是否可用 + if [ -d /proc/sys/fs/binfmt_misc ]; then + echo "✅ binfmt_misc 可用" + ls /proc/sys/fs/binfmt_misc/ | grep -E "qemu-(aarch64|arm)" || echo "⚠️ 部分架构可能未注册" + fi + + # 创建 buildx builder + docker buildx create --use --name multiarch-builder --driver docker-container --driver-opt network=host || true + docker buildx inspect --bootstrap - name: Build binaries run: | @@ -45,7 +55,7 @@ jobs: tar -czf "${TARGZ}" -C "$DIR" . # 快速验证 - mkdir test && tar -xzf "${TARGZ}" -C test + mkdir -p test && tar -xzf "${TARGZ}" -C test test/xxxigDaemon --version 2>/dev/null || echo "⚠️ 跳过版本检查" rm -rf test done @@ -72,8 +82,14 @@ jobs: - name: Setup Docker and Login run: | - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes - docker buildx create --use --driver docker-container + # 尝试设置 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 || true + docker buildx inspect --bootstrap + + # 登录 echo "${{ secrets.BUILD_TOKEN }}" | docker login ${{ gitea.server_url }} -u ${{ gitea.actor }} --password-stdin - name: Determine Docker tag @@ -163,4 +179,4 @@ jobs: } EOF - echo "✅ Release 创建完成!" + echo "✅ Release 创建完成!" \ No newline at end of file