Merge branch 'test'

1 week ago · e6bb889454
7 changed files with 184 additions and 76 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -0,0 +1,81 @@
+kind: pipeline
+type: exec
+name: deploy
+clone:
+  disable: true
+
+trigger:
+  branch:
+    - main
+  event:
+    - push
+
+steps:
+  - name: debug
+    commands:
+      - echo $PATH
+      - whoami
+      - which node
+      - which pm2
+  - name: deploy
+    environment:
+      # exec runner 常不设置 HOME，会导致 ~/.bun、~/.nvm 等路径展开错误
+      HOME: /root
+      DEPLOY_BRANCH: deploy
+      REPO_DIR: /root/projects/nuxt4-demo/nuxt4-demo-origin
+      # Gitea 必须用 git 用户拉代码；用 root@ 可能 SSH 能过但 git 会话卡住
+      GIT_REMOTE: ssh://git@git.xieyaxin.top:8892/topuser/nuxt4-demo.git
+      GIT_SSH_HOST: git.xieyaxin.top
+      GIT_SSH_PORT: "8892"
+      UNZIP_DIR: /root/projects/nuxt4-demo/nuxt4-demo
+      DEPLOY_SSH_KEY:
+        from_secret: DEPLOY_SSH_KEY
+      DATABASE_URL:
+        from_secret: DATABASE_URL
+      NITRO_PORT:
+        from_secret: NITRO_PORT
+      STATIC_DIR:
+        from_secret: STATIC_DIR
+      TMP_DIR:
+        from_secret: TMP_DIR
+      MEDIA_UPLOAD_SUBDIR:
+        from_secret: MEDIA_UPLOAD_SUBDIR
+      BOOTSTRAP_ADMIN_USERNAME:
+        from_secret: BOOTSTRAP_ADMIN_USERNAME
+      BOOTSTRAP_ADMIN_PASSWORD:
+        from_secret: BOOTSTRAP_ADMIN_PASSWORD
+    commands:
+      - mkdir -p -m 700 "/root/.ssh"
+      - umask 077 && printf '%s\n' "$DEPLOY_SSH_KEY" > "/root/.ssh/id_rsa"
+      # 须与 GIT_REMOTE 主机一致，否则 StrictHostKeyChecking 会因缺少 [host]:port 的密钥失败
+      - 'ssh-keyscan -p "$GIT_SSH_PORT" -H -T 15 "$GIT_SSH_HOST" > "/root/.ssh/known_hosts" && chmod 644 "/root/.ssh/known_hosts"'
+      - 'export SSH_OPTS="-i /root/.ssh/id_rsa -p $GIT_SSH_PORT -o IdentitiesOnly=yes -o UserKnownHostsFile=/root/.ssh/known_hosts -o StrictHostKeyChecking=yes -o BatchMode=yes -o ConnectTimeout=10 -o ServerAliveInterval=15 -o ServerAliveCountMax=3"'
+      # 与 GIT_REMOTE 用户一致（deploy key 挂在 Gitea 的 git 访问上）
+      - 'ssh $SSH_OPTS -T git@"$GIT_SSH_HOST" || true'
+      - 'export GIT_SSH_COMMAND="ssh $SSH_OPTS"'
+      - |
+        set -e
+        export GIT_TERMINAL_PROMPT=0
+        BRANCH="$DEPLOY_BRANCH"
+        REPO_DIR="$REPO_DIR"
+        GIT_REMOTE="$GIT_REMOTE"
+        if [ -d "$REPO_DIR/.git" ]; then
+          git -C "$REPO_DIR" fetch --progress --depth 1 origin "$BRANCH"
+          git -C "$REPO_DIR" checkout -B "$BRANCH" "origin/$BRANCH"
+          git -C "$REPO_DIR" reset --hard "origin/$BRANCH"
+          git -C "$REPO_DIR" clean -fdx
+        else
+          rm -rf "$REPO_DIR"
+          mkdir -p "$(dirname "$REPO_DIR")"
+          git clone --progress --depth 1 -b "$BRANCH" "$GIT_REMOTE" "$REPO_DIR"
+        fi
+      - |
+        set -e
+        [ -f "$REPO_DIR/build-output.tar.gz" ] || { echo "build-output.tar.gz not found in $REPO_DIR"; exit 1; }
+        rm -rf "$UNZIP_DIR"
+        mkdir -p "$UNZIP_DIR"
+        tar -xzf "$REPO_DIR/build-output.tar.gz" -C "$UNZIP_DIR"
+      - cd "$UNZIP_DIR"
+      - pm2 stop nuxt4-demo || true
+      - pm2 delete nuxt4-demo || true
+      - pm2 start ./run.sh --name nuxt4-demo
--- a/.gitignore
+++ b/.gitignore
@ -6,6 +6,7 @@
 .cache
 dist
 .tmp_dist
+.tmp_build-output.tar.gz

 # Node dependencies
 node_modules
--- a/build-files/.drone.yml
+++ b/build-files/.drone.yml
@ -1,31 +0,0 @@
-kind: pipeline
-type: exec
-name: deploy
-
-trigger:
-  branch:
-    - deploy-branch
-  event:
-    - push
-
-steps:
-  - name: deploy
-    environment:
-      DATABASE_URL:
-        from_secret: DATABASE_URL
-      STATIC_DIR:
-        from_secret: STATIC_DIR
-      TMP_DIR:
-        from_secret: TMP_DIR
-      NUXT_PUBLIC_SITE_URL:
-        from_secret: NUXT_PUBLIC_SITE_URL
-      BOOTSTRAP_ADMIN_USERNAME:
-        from_secret: BOOTSTRAP_ADMIN_USERNAME
-      BOOTSTRAP_ADMIN_PASSWORD:
-        from_secret: BOOTSTRAP_ADMIN_PASSWORD
-    commands:
-      - export HOME=/root
-      - 'REPO_DIR="$HOME/projects/nuxt4-demo/nuxt4-demo"; SRC_DIR="$(pwd)"; rm -rf "$REPO_DIR"; mkdir -p "$(dirname "$REPO_DIR")"; cp -a "$SRC_DIR" "$REPO_DIR"'
-      - 'bash -lc "cd $HOME/projects/nuxt4-demo/nuxt4-demo && pm2 stop nuxt4-demo || true"'
-      - 'bash -lc "cd $HOME/projects/nuxt4-demo/nuxt4-demo && pm2 delete nuxt4-demo || true"'
-      - 'bash -lc "cd $HOME/projects/nuxt4-demo/nuxt4-demo && pm2 start ./run.sh --name nuxt4-demo"'
--- a/package.json
+++ b/package.json
@ -9,9 +9,9 @@
  "scripts": {
    "build": "bun run sync:vditor && nuxt build && bun run cp:db && bun --elide-lines=0 --filter drizzle-pkg build",
    "dev": "bun run sync:vditor && nuxt dev",
-    "deploy": "sh scripts/deploy.sh",
+    "deploy": "sh scripts/deploy-gitea.sh",
    "sync:vditor": "sh scripts/sync-vditor-assets.sh",
-    "cp:db": "cp build-files/run.sh .output/run.sh && cp build-files/.drone.yml .output/.drone.yml && sh scripts/mv-env.sh && cp -r build-files/migrate/* .output/server/ && cp build-files/seed.js .output/server/seed.js",
+    "cp:db": "cp build-files/run.sh .output/run.sh && cp -r build-files/migrate/* .output/server/ && cp build-files/seed.js .output/server/seed.js",
    "migrate:test": "sh scripts/migrate-test.sh",
    "db:migrate": "bun --elide-lines=0 --filter drizzle-pkg migrate",
    "db:generate": "bun --elide-lines=0 --filter drizzle-pkg generate",
--- a/scripts/deploy-gitea.sh
+++ b/scripts/deploy-gitea.sh
@ -2,8 +2,10 @@

 # 配置区（只改这里）
 GIT_REPO_URL="ssh://root@git.xieyaxin.top:8892/topuser/nuxt4-demo.git"
-PROD_BRANCH="deploy-branch"        # 你要存放产物的分支名（会自动创建）
+PROD_BRANCH="deploy"        # 你要存放产物的分支名（会自动创建）
 BUILD_FOLDER=".output"       # 打包产物目录
+ARCHIVE_NAME="build-output.tar.gz"
+ARCHIVE_PATH=".tmp_${ARCHIVE_NAME}"
 COMMIT_MSG="deploy: build at $(date +'%Y-%m-%d %H:%M:%S')"

 # 1. 先打包
@ -22,13 +24,17 @@ git clone --single-branch --branch $PROD_BRANCH $GIT_REPO_URL .tmp_dist || {
  cd ..
 }

-# 3. 删除旧产物，复制新产物
+# 3. 压缩构建产物
+echo "🗜️ 压缩构建目录..."
+tar -czf "$ARCHIVE_PATH" -C "$BUILD_FOLDER" .
+
+# 4. 删除旧产物，复制新产物
 echo "♻️ 更新产物文件..."
 rm -rf .tmp_dist/*
 cp -r $BUILD_FOLDER/.drone.yml .tmp_dist/.drone.yml
-cp -r $BUILD_FOLDER/* .tmp_dist/
+cp "$ARCHIVE_PATH" ".tmp_dist/$ARCHIVE_NAME"

-# 4. 提交并推送
+# 5. 提交并推送
 cd .tmp_dist
 git add -A
 git commit -m "$COMMIT_MSG"
@ -36,8 +42,9 @@ git commit -m "$COMMIT_MSG"
 echo "🚀 推送到远程分支 $PROD_BRANCH..."
 git push origin $PROD_BRANCH

-# 5. 清理临时文件
+# 6. 清理临时文件
 cd ..
 rm -rf .tmp_dist
+rm -f "$ARCHIVE_PATH"

 echo "✅ 发布完成！"
--- a/scripts/deploy-gitee.sh
+++ b/scripts/deploy-gitee.sh
@ -0,0 +1,50 @@
+#!/usr/bin/env sh
+
+# 配置区（只改这里）
+GIT_REPO_URL="git@gitee.com:xieyaxin/nuxt4-demo.git"
+PROD_BRANCH="deploy"        # 你要存放产物的分支名（会自动创建）
+BUILD_FOLDER=".output"       # 打包产物目录
+ARCHIVE_NAME="build-output.tar.gz"
+ARCHIVE_PATH=".tmp_${ARCHIVE_NAME}"
+COMMIT_MSG="deploy: build at $(date +'%Y-%m-%d %H:%M:%S')"
+
+# 1. 先打包
+echo "📦 构建项目..."
+bun run build
+
+# 2. 克隆远程产物分支到临时目录
+echo "⬇️ 拉取产物分支..."
+git clone --single-branch --branch $PROD_BRANCH $GIT_REPO_URL .tmp_dist || {
+  echo "🆕 分支不存在，创建新分支..."
+  mkdir .tmp_dist
+  cd .tmp_dist
+  git init
+  git checkout -b $PROD_BRANCH
+  git remote add origin $GIT_REPO_URL
+  cd ..
+}
+
+# 3. 压缩构建产物
+echo "🗜️ 压缩构建目录..."
+tar -czf "$ARCHIVE_PATH" -C "$BUILD_FOLDER" .
+
+# 4. 删除旧产物，复制新产物
+echo "♻️ 更新产物文件..."
+rm -rf .tmp_dist/*
+cp -r $BUILD_FOLDER/.drone.yml .tmp_dist/.drone.yml
+cp "$ARCHIVE_PATH" ".tmp_dist/$ARCHIVE_NAME"
+
+# 5. 提交并推送
+cd .tmp_dist
+git add -A
+git commit -m "$COMMIT_MSG"
+
+echo "🚀 推送到远程分支 $PROD_BRANCH..."
+git push origin $PROD_BRANCH
+
+# 6. 清理临时文件
+cd ..
+rm -rf .tmp_dist
+rm -f "$ARCHIVE_PATH"
+
+echo "✅ 发布完成！"