diff --git a/.gitea/workflows/research_build_manual.yaml b/.gitea/workflows/research_build_manual.yaml index 8fca2bc4..04780daa 100644 --- a/.gitea/workflows/research_build_manual.yaml +++ b/.gitea/workflows/research_build_manual.yaml @@ -107,22 +107,24 @@ jobs: echo "docker-compose.yml内容:" cat docker-compose.yml + - name: 7.安装SSH工具 run: | $SUDO apt install -y sshpass openssh-client --no-install-recommends + # 配置SSH免密 mkdir -p ~/.ssh + echo "${{ secrets.SSH_KEY }}" > ~/.ssh/id_rsa + chmod 600 ~/.ssh/id_rsa + ssh-keyscan -H ${{ secrets.SERVER_HOST }} >> ~/.ssh/known_hosts - name: 8.同步文件到远程服务器 - env: - # 注意:这里的名字必须全大写 SSHPASS,sshpass 工具会自动识别这个变量名 - SSHPASS: ${{ secrets.SSH_PASSWORD }} run: | - echo "===== 使用密码同步文件到远程服务器 =====" - - # 确保环境变量已加载,直接调用 sshpass -e - sshpass -e scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \ + echo "===== 同步文件到远程服务器 =====" + # 使用scp同步文件 + scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \ ./target/*.jar ./Dockerfile ./docker-compose.yml \ - ${{ secrets.SEARCH_SERVER_USER }}@${{ secrets.SEARCH_SERVER_HOST }}:${{ env.REMOTE_DEPLOY_PATH }} + ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_HOST }}:${{ env.REMOTE_DEPLOY_PATH }} 2>&1 + - name: 9.部署和运行服务 run: |