From ce2ecdc8f6883a9d01c7e6fdd97817ba221536ac Mon Sep 17 00:00:00 2001 From: skeleton Date: Mon, 14 Oct 2024 05:33:49 +0000 Subject: [PATCH 1/7] =?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 802b0d0..d61830c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,6 +62,6 @@ deploy-job: - echo '提交代码' - cd $GOPATH/src/$DeployPath - git add . - - git commit -m "auto commit pipelineId: $CI_PIPELINE_ID" + - git commit -m "auto commit pipelineId\:$CI_PIPELINE_ID" - git push origin develop From 8214650eef6c58e1395fdd77a82da0fd6ca346f4 Mon Sep 17 00:00:00 2001 From: skeleton Date: Mon, 14 Oct 2024 05:37:32 +0000 Subject: [PATCH 2/7] =?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 d61830c..0aa4029 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,6 +3,7 @@ stages: - deploy variables: + GOPATH: "/root/gopath" ProjectPath: "mongo.games.com/game" DeployPath: "mongo.games.com/deploy" From 8df42379e2349bab4e3913fbf5935d5e8be4c71b Mon Sep 17 00:00:00 2001 From: skeleton Date: Mon, 14 Oct 2024 05:40:39 +0000 Subject: [PATCH 3/7] =?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, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0aa4029..b888a16 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,8 +4,8 @@ stages: variables: GOPATH: "/root/gopath" - ProjectPath: "mongo.games.com/game" - DeployPath: "mongo.games.com/deploy" + ProjectPath: "mongo.games.com/game/" + DeployPath: "mongo.games.com/deploy/" default: tags: From 17c29b246e6386aa85dbbf171e46a9780d9da1ed Mon Sep 17 00:00:00 2001 From: skeleton Date: Mon, 14 Oct 2024 05:41:34 +0000 Subject: [PATCH 4/7] =?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, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b888a16..25e5713 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,6 +30,8 @@ build-job: go build -v cd .. done < shell/programs.txt + only: + - develop deploy-job: stage: deploy @@ -65,4 +67,6 @@ deploy-job: - git add . - git commit -m "auto commit pipelineId\:$CI_PIPELINE_ID" - git push origin develop + only: + - develop From 8d51143e18c7a67e9fde63c781defd0ebf7e9e6c Mon Sep 17 00:00:00 2001 From: skeleton Date: Mon, 14 Oct 2024 05:42:57 +0000 Subject: [PATCH 5/7] =?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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 25e5713..2970490 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,8 +4,8 @@ stages: variables: GOPATH: "/root/gopath" - ProjectPath: "mongo.games.com/game/" - DeployPath: "mongo.games.com/deploy/" + ProjectPath: "mongo.games.com/game" + DeployPath: "mongo.games.com/deploy" default: tags: @@ -16,7 +16,7 @@ build-job: script: # 拷贝到GOPATH - echo '拷贝到GOPATH' - - cp -rfvp ./* $GOPATH/src/$ProjectPath + - cp -rf ./* $GOPATH/src/$ProjectPath # 进入项目目录 - cd $GOPATH/src/$ProjectPath # 编译 From 9de6ddc3d71554c1897d230aed4922a9edb752a0 Mon Sep 17 00:00:00 2001 From: skeleton Date: Mon, 14 Oct 2024 05:45:28 +0000 Subject: [PATCH 6/7] =?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 2970490..affbf12 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,7 +16,7 @@ build-job: script: # 拷贝到GOPATH - echo '拷贝到GOPATH' - - cp -rf ./* $GOPATH/src/$ProjectPath + - cp -rfp ./* $GOPATH/src/$ProjectPath # 进入项目目录 - cd $GOPATH/src/$ProjectPath # 编译 From b6b0377be9aeb4be1ccb560d2696830218e5bcfa Mon Sep 17 00:00:00 2001 From: skeleton Date: Mon, 14 Oct 2024 05:54:06 +0000 Subject: [PATCH 7/7] =?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 affbf12..2dcfdd8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,13 +3,12 @@ stages: - deploy variables: - GOPATH: "/root/gopath" ProjectPath: "mongo.games.com/game" DeployPath: "mongo.games.com/deploy" default: tags: - - game-develop + - gitlab build-job: stage: build