diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index faf0e9e..c894c08 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,6 +41,7 @@ build-job: - develop - release script: + # 拉取代码 - git checkout $CI_COMMIT_REF_NAME - git pull origin $CI_COMMIT_REF_NAME @@ -54,7 +55,7 @@ build-job: # 编译 - echo '编译' - if [ "$GOMODTIDY" == 1 ]; then - go mod tidy; + go mod tidy; fi - | while IFS= read -r line || [[ -n $line ]] @@ -65,18 +66,13 @@ build-job: cd .. done < ./programs.txt -save-job: - stage: save - only: - - develop - - release - script: # 拷贝文件 - echo '拷贝文件' - rm -rf ./temp - mkdir ./temp - mkdir ./temp/data - cp -rfp ./data/* ./temp/data + # 删除自定义配置 - echo '删除自定义配置' - | @@ -85,6 +81,7 @@ save-job: echo "删除 $line 配置" rm ./temp/data/$line done < ./exclude.txt + # 拷贝可执行程序 - echo '拷贝可执行程序' - | @@ -93,14 +90,8 @@ save-job: echo "拷贝 $line" mv ./$line/$line ./temp/$line done < ./programs.txt - -sync_job: - stage: sync - only: - - develop - - release - script: - - if [ "$CI_COMMIT_BRANCH" == "develop" ]; then + + - if [ "$CI_COMMIT_BRANCH" == "develop" ]; then SSH_PRIVATE_KEY="$SSH_PRIVATE_KEY_DEVELOP"; REMOTE_HOST="$REMOTE_HOST_DEVELOP"; REMOTE_USER="$REMOTE_USER_DEVELOP"; @@ -128,7 +119,7 @@ sync_job: - echo "同步到服务器" - echo "Deploying to remote server using rsync... $BinPath" - rsync -rvz --delete ./temp/ $REMOTE_USER@$REMOTE_HOST:$BinPath - + # 触发部署 - "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"