Compare commits

..

No commits in common. "7d05aefe37f72bb5836bef5e9087fb9b5b0a898b" and "8689199e01bc6c4cb9d30a06c47cd99fe8f9bd4f" have entirely different histories.

1 changed files with 7 additions and 13 deletions

View File

@ -91,14 +91,10 @@ 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;
@ -117,18 +113,16 @@ sync_job:
- 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
- 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 "释放锁定,流水线结束。"
when: always
- echo "释放锁定,流水线结束。"