From 19198c8a47d7866a23c9038ce237378533bd4680 Mon Sep 17 00:00:00 2001 From: jeremygan2021 Date: Fri, 20 Mar 2026 16:30:10 +0800 Subject: [PATCH] actino --- .gitea/workflows/deploy.yml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index d2fc0af..cd509ab 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -25,12 +25,16 @@ jobs: SERVER_PASSWORD: ${{ secrets.SERVER_PASSWORD }} SERVER_PORT: ${{ secrets.SERVER_PORT }} TARGET_DIR: ${{ env.TARGET_DIR }} + ALIYUN_ACCESS_KEY_ID: ${{ secrets.ALIYUN_ACCESS_KEY_ID }} + ALIYUN_ACCESS_KEY_SECRET: ${{ secrets.ALIYUN_ACCESS_KEY_SECRET }} + ALIYUN_TINGWU_APP_KEY: ${{ secrets.ALIYUN_TINGWU_APP_KEY }} + DASHSCOPE_API_KEY: ${{ secrets.DASHSCOPE_API_KEY }} run: | - sshpass -p "$SERVER_PASSWORD" ssh -p "$SERVER_PORT" -o StrictHostKeyChecking=no "${SERVER_USER}@${SERVER_HOST}" << 'EOF' + sshpass -p "$SERVER_PASSWORD" ssh -p "$SERVER_PORT" -o StrictHostKeyChecking=no "${SERVER_USER}@${SERVER_HOST}" << EOF set -e run_sudo() { - echo "$SERVER_PASSWORD" | sudo -S -p '' "$@" + echo "$SERVER_PASSWORD" | sudo -S -p '' "\$@" } echo "===== 切换到目标目录: $TARGET_DIR =====" @@ -46,20 +50,20 @@ jobs: if ! git pull; then echo "警告:Git pull 失败,尝试强制同步远程代码..." git fetch --all - CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD) - git reset --hard origin/$CURRENT_BRANCH + CURRENT_BRANCH=\$(git rev-parse --abbrev-ref HEAD) + git reset --hard origin/\$CURRENT_BRANCH git pull fi echo -e "\n===== 配置环境变量 =====" cat > backend/.env <<'ENVEOF' -ALIYUN_ACCESS_KEY_ID=${{ secrets.ALIYUN_ACCESS_KEY_ID }} -ALIYUN_ACCESS_KEY_SECRET=${{ secrets.ALIYUN_ACCESS_KEY_SECRET }} +ALIYUN_ACCESS_KEY_ID=$ALIYUN_ACCESS_KEY_ID +ALIYUN_ACCESS_KEY_SECRET=$ALIYUN_ACCESS_KEY_SECRET ALIYUN_OSS_ENDPOINT=https://oss-cn-shanghai.aliyuncs.com ALIYUN_OSS_BUCKET_NAME=tangledup-ai-staging ALIYUN_OSS_INTERNAL_ENDPOINT=https://oss-cn-shanghai-internal.aliyuncs.com -ALIYUN_TINGWU_APP_KEY=${{ secrets.ALIYUN_TINGWU_APP_KEY }} -DASHSCOPE_API_KEY=${{ secrets.DASHSCOPE_API_KEY }} +ALIYUN_TINGWU_APP_KEY=$ALIYUN_TINGWU_APP_KEY +DASHSCOPE_API_KEY=$DASHSCOPE_API_KEY ENVEOF echo -e "\n===== 启动 Docker 容器 ====="