From e076d40daa12984490fb21589eb49c4e568627cc Mon Sep 17 00:00:00 2001 From: gouki Date: Thu, 6 Aug 2026 23:27:41 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B3=A8=E5=86=8C=20lunar=20=E4=B8=93?= =?UTF-8?q?=E5=B1=9E=E8=BF=90=E8=A1=8C=E5=99=A8=E5=B9=B6=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 doc79 注册 act_runner-lunar(ID 43),模式参考 readitlater - lunar-node: docker://node:22-bookworm(小程序构建) - lunar-ci: docker://golang:1.22-bookworm(后端构建) - 产物挂载 /opt/lunar/ci-artifacts:/ci-artifacts - .gitignore 补充 web/ 和 .ci-tmp/ --- .gitea/workflows/miniapp-preview.yml | 6 +++--- .gitea/workflows/server-deploy.yml | 11 +++-------- .gitignore | 4 ++++ 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.gitea/workflows/miniapp-preview.yml b/.gitea/workflows/miniapp-preview.yml index cbe2c5c..8f7922c 100644 --- a/.gitea/workflows/miniapp-preview.yml +++ b/.gitea/workflows/miniapp-preview.yml @@ -10,8 +10,8 @@ on: jobs: publish: - # 使用 hk 运行器(空闲状态) - runs-on: hk + # 专属运行器:docker://node:22-bookworm(注册于 doc79,参考 new-pet-node 模式) + runs-on: lunar-node steps: - uses: https://gitea.neatcn.com/gouki/action-checkout@v4 with: @@ -92,7 +92,7 @@ jobs: cp mini/ci-artifacts/upload-result.json "/ci-artifacts/miniapp-upload-${{ gitea.sha }}.json" cp mini/ci-artifacts/upload-result.json /ci-artifacts/miniapp-upload-latest.json ls -la /ci-artifacts/miniapp-upload-latest.json - echo "Upload result saved on runner host: /ci-artifacts/miniapp-upload-latest.json" + echo "Upload result saved on runner host: /opt/lunar/ci-artifacts/miniapp-upload-latest.json" - name: Remove temporary credentials if: always() run: rm -f "$RUNNER_TEMP/wechat-ci.key" diff --git a/.gitea/workflows/server-deploy.yml b/.gitea/workflows/server-deploy.yml index 257797e..984e570 100644 --- a/.gitea/workflows/server-deploy.yml +++ b/.gitea/workflows/server-deploy.yml @@ -10,18 +10,13 @@ on: jobs: build: - # 使用 hk 运行器(空闲状态) - runs-on: hk + # 专属运行器:docker://golang:1.22-bookworm(注册于 doc79) + runs-on: lunar-ci steps: - uses: https://gitea.neatcn.com/gouki/action-checkout@v4 with: fetch-depth: 20 - - name: Setup Go - uses: https://gitea.neatcn.com/gouki/action-setup-go@v4 - with: - go-version: '1.22' - - name: Verify Go runtime run: go version @@ -72,7 +67,7 @@ jobs: cp server/deploy.tar.gz "/ci-artifacts/server-deploy-${{ gitea.sha }}.tar.gz" cp server/deploy.tar.gz /ci-artifacts/server-deploy-latest.tar.gz ls -la /ci-artifacts/server-deploy-latest.tar.gz - echo "Deployment package saved on runner host: /ci-artifacts/server-deploy-latest.tar.gz" + echo "Deployment package saved on runner host: /opt/lunar/ci-artifacts/server-deploy-latest.tar.gz" - name: Cleanup if: always() diff --git a/.gitignore b/.gitignore index ed73966..727952d 100644 --- a/.gitignore +++ b/.gitignore @@ -41,6 +41,7 @@ logs/ # 临时文件 tmp/ temp/ +.ci-tmp/ # Go server/bin/ @@ -59,6 +60,9 @@ server/public/build/ server/public/hot server/web/ +# web 版万年历(独立项目,不属于本仓库) +web/ + # 数据库 *.db *.sqlite