From aa046ec0e2207027a65f11d32b876b49ef841f2f Mon Sep 17 00:00:00 2001
From: skeleton <liuzheng@example.com>
Date: Wed, 16 Oct 2024 07:02:38 +0000
Subject: [PATCH 01/12] =?UTF-8?q?=E6=9B=B4=E6=96=B0.gitlab-ci.yml=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitlab-ci.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 49f971b..671b233 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -111,6 +111,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:

From 8689199e01bc6c4cb9d30a06c47cd99fe8f9bd4f Mon Sep 17 00:00:00 2001
From: skeleton <liuzheng@example.com>
Date: Wed, 16 Oct 2024 07:11:56 +0000
Subject: [PATCH 02/12] =?UTF-8?q?=E6=9B=B4=E6=96=B0.gitlab-ci.yml=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 671b233..8944e28 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -118,7 +118,7 @@ sync_job:
       -F token=$SERVER_CI_TOKEN \
       -F "ref=release" \
       -F "variables[ServerName]=$ServerName" \
-      - https://git.pogorockgames.com/api/v4/projects/31/trigger/pipeline
+      https://git.pogorockgames.com/api/v4/projects/31/trigger/pipeline
 
 # 解锁作业，释放锁定
 unlock_job:

From bf05bda12a25fa4748da3a324aaedc9b002d4b42 Mon Sep 17 00:00:00 2001
From: skeleton <liuzheng@example.com>
Date: Wed, 16 Oct 2024 07:13:19 +0000
Subject: [PATCH 03/12] =?UTF-8?q?=E6=9B=B4=E6=96=B0.gitlab-ci.yml=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitlab-ci.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8944e28..2b47acf 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;
@@ -125,4 +129,5 @@ 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

From 7d05aefe37f72bb5836bef5e9087fb9b5b0a898b Mon Sep 17 00:00:00 2001
From: skeleton <liuzheng@example.com>
Date: Wed, 16 Oct 2024 07:18:16 +0000
Subject: [PATCH 04/12] =?UTF-8?q?=E6=9B=B4=E6=96=B0.gitlab-ci.yml=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitlab-ci.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2b47acf..793fd5e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -117,12 +117,13 @@ 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:

From d4430fc78dbbcaeb4ed107a1ce5a77de119d7e95 Mon Sep 17 00:00:00 2001
From: skeleton <liuzheng@example.com>
Date: Wed, 16 Oct 2024 07:23:53 +0000
Subject: [PATCH 05/12] =?UTF-8?q?=E6=9B=B4=E6=96=B0.gitlab-ci.yml=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitlab-ci.yml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 793fd5e..bce13a8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -117,13 +117,7 @@ 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:

From 5022481ed20aecccc3bcd52d911730fa9a3969bd Mon Sep 17 00:00:00 2001
From: skeleton <liuzheng@example.com>
Date: Wed, 16 Oct 2024 07:26:58 +0000
Subject: [PATCH 06/12] =?UTF-8?q?=E6=9B=B4=E6=96=B0.gitlab-ci.yml=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bce13a8..ff1fa5a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -117,7 +117,7 @@ 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 https://git.pogorockgames.com/api/v4/projects/31/trigger/pipeline"
 
 # 解锁作业，释放锁定
 unlock_job:

From f4d924b9ad3d5e576047c7056969b71356fc4c4e Mon Sep 17 00:00:00 2001
From: skeleton <liuzheng@example.com>
Date: Wed, 16 Oct 2024 07:28:47 +0000
Subject: [PATCH 07/12] =?UTF-8?q?=E6=9B=B4=E6=96=B0.gitlab-ci.yml=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ff1fa5a..7c821f9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -117,7 +117,7 @@ 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 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:

From b86ce547aac63c9dcd855a1f2a44ac938d2fcba8 Mon Sep 17 00:00:00 2001
From: skeleton <liuzheng@example.com>
Date: Wed, 16 Oct 2024 07:57:07 +0000
Subject: [PATCH 08/12] =?UTF-8?q?=E6=9B=B4=E6=96=B0.gitlab-ci.yml=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7c821f9..e113eaa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,6 +31,7 @@ build-job:
     - develop
     - release
   script:
+    - curl -I https://git.pogorockgames.com
     - git checkout $CI_COMMIT_REF_NAME
     - git pull
     # 拷贝到GOPATH

From 5d63c3ce5bb126dfbcc4138b66aa40fb0b5573b5 Mon Sep 17 00:00:00 2001
From: skeleton <liuzheng@example.com>
Date: Wed, 16 Oct 2024 07:59:47 +0000
Subject: [PATCH 09/12] =?UTF-8?q?=E6=9B=B4=E6=96=B0.gitlab-ci.yml=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitlab-ci.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e113eaa..e04894e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,7 +31,6 @@ build-job:
     - develop
     - release
   script:
-    - curl -I https://git.pogorockgames.com
     - git checkout $CI_COMMIT_REF_NAME
     - git pull
     # 拷贝到GOPATH
@@ -118,7 +117,7 @@ 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:

From 3252b0bbb3f1c9afa8d54768a7c675f6c7478515 Mon Sep 17 00:00:00 2001
From: skeleton <liuzheng@example.com>
Date: Wed, 16 Oct 2024 08:08:09 +0000
Subject: [PATCH 10/12] =?UTF-8?q?=E6=9B=B4=E6=96=B0.gitlab-ci.yml=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e04894e..78a87a8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -117,7 +117,8 @@ 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 --version
+    - 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:

From ab2221f7eabb3b874a9298f4f98038784be0e135 Mon Sep 17 00:00:00 2001
From: skeleton <liuzheng@example.com>
Date: Wed, 16 Oct 2024 08:18:52 +0000
Subject: [PATCH 11/12] =?UTF-8?q?=E6=9B=B4=E6=96=B0.gitlab-ci.yml=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 78a87a8..1e8886f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -117,7 +117,8 @@ sync_job:
     - rsync -avz --delete ./temp/ $REMOTE_USER@$REMOTE_HOST:$REMOTE_DEPLOY_PATH
     
     # 触发部署
-    - curl --version
+    - echo "$SERVER_CI_TOKEN"
+    - echo "$ServerName"
     - 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
 
 # 解锁作业，释放锁定

From 0ae60f1f2d76ade68c4db0edfa1806da3fd93ee0 Mon Sep 17 00:00:00 2001
From: skeleton <liuzheng@example.com>
Date: Wed, 16 Oct 2024 08:28:57 +0000
Subject: [PATCH 12/12] =?UTF-8?q?=E6=9B=B4=E6=96=B0.gitlab-ci.yml=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitlab-ci.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1e8886f..7c821f9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -117,9 +117,7 @@ sync_job:
     - rsync -avz --delete ./temp/ $REMOTE_USER@$REMOTE_HOST:$REMOTE_DEPLOY_PATH
     
     # 触发部署
-    - echo "$SERVER_CI_TOKEN"
-    - echo "$ServerName"
-    - 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: