tl_server_2
/
game_sync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop

This commit is contained in:
sk 2024-10-16 16:29:33 +08:00
parent b07e90ee47 0ae60f1f2d
commit a61fdc3a7f
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitlab-ci.yml
View File

@ -91,10 +91,14 @@ sync_job:
SSH_PRIVATE_KEY="$SSH_PRIVATE_KEY_DEVELOP"; SSH_PRIVATE_KEY="$SSH_PRIVATE_KEY_DEVELOP";
REMOTE_HOST="$REMOTE_HOST_DEVELOP"; REMOTE_HOST="$REMOTE_HOST_DEVELOP";
REMOTE_USER="$REMOTE_USER_DEVELOP"; REMOTE_USER="$REMOTE_USER_DEVELOP";
SERVER_CI_TOKEN="$REMOTE_CI_TOKEN_DEVELOP";
ServerName="develop";
elif [ "$CI_COMMIT_BRANCH" == "release" ]; then elif [ "$CI_COMMIT_BRANCH" == "release" ]; then
SSH_PRIVATE_KEY="$SSH_PRIVATE_KEY_BETA"; SSH_PRIVATE_KEY="$SSH_PRIVATE_KEY_BETA";
REMOTE_HOST="$REMOTE_HOST_BETA"; REMOTE_HOST="$REMOTE_HOST_BETA";
REMOTE_USER="$REMOTE_USER_BETA"; REMOTE_USER="$REMOTE_USER_BETA";
SERVER_CI_TOKEN="$REMOTE_CI_TOKEN_BETA";
ServerName="beta";
else else
echo "不支持的分支"; echo "不支持的分支";
exit 1; exit 1;
@ -112,9 +116,13 @@ sync_job:
- echo "Deploying to remote server using rsync..." - echo "Deploying to remote server using rsync..."
- rsync -avz --delete ./temp/ $REMOTE_USER@$REMOTE_HOST:$REMOTE_DEPLOY_PATH - 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: unlock_job:
stage: unlock stage: unlock
script: script:
- rm -f /tmp/ci_lock - rm -f /tmp/ci_lock
- echo "释放锁定，流水线结束。" - echo "释放锁定，流水线结束。"
when: always