diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d2db392..8521704 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -91,10 +91,14 @@ sync_job: SSH_PRIVATE_KEY="$SSH_PRIVATE_KEY_DEVELOP"; REMOTE_HOST="$REMOTE_HOST_DEVELOP"; REMOTE_USER="$REMOTE_USER_DEVELOP"; + SERVER_CI_TOKEN="$REMOTE_CI_TOKEN_DEVELOP"; + ServerName="develop"; elif [ "$CI_COMMIT_BRANCH" == "release" ]; then SSH_PRIVATE_KEY="$SSH_PRIVATE_KEY_BETA"; REMOTE_HOST="$REMOTE_HOST_BETA"; REMOTE_USER="$REMOTE_USER_BETA"; + SERVER_CI_TOKEN="$REMOTE_CI_TOKEN_BETA"; + ServerName="beta"; else echo "不支持的分支"; exit 1; @@ -111,10 +115,14 @@ sync_job: - echo "同步到服务器" - echo "Deploying to remote server using rsync..." - rsync -avz --delete ./temp/ $REMOTE_USER@$REMOTE_HOST:$REMOTE_DEPLOY_PATH + + # 触发部署 + - "curl -X POST --fail -F token=$SERVER_CI_TOKEN -F ref=release -F variables[ServerName]=$ServerName https://git.pogorockgames.com/api/v4/projects/31/trigger/pipeline" # 解锁作业,释放锁定 unlock_job: stage: unlock script: - rm -f /tmp/ci_lock - - echo "释放锁定,流水线结束。" \ No newline at end of file + - echo "释放锁定,流水线结束。" + when: always \ No newline at end of file