From 5de9db3cc8261e4fad86ba333d93b032800d5e45 Mon Sep 17 00:00:00 2001 From: hxt Date: Tue, 8 Jul 2025 20:54:24 +0800 Subject: [PATCH 01/10] =?UTF-8?q?ci(drone):=20=E6=B7=BB=E5=8A=A0=20Go=20?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=92=8C=E6=9E=84=E5=BB=BA=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 restore cache 和 rebuild cache 步骤中添加了 go-mod-cache 和 go-build-cache 卷 - 新增了主机路径缓存，提高 CI --- .drone.yml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 202bc09..cefeef0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,6 +5,11 @@ name: default steps: - name: restore cache image: drillster/drone-volume-cache + volumes: + - name: go-mod-cache + path: /go/pkg/mod + - name: go-build-cache + path: /root/.cache/go-build settings: restore: true mount: @@ -23,6 +28,11 @@ steps: - name: rebuild cache image: drillster/drone-volume-cache + volumes: + - name: go-mod-cache + path: /go/pkg/mod + - name: go-build-cache + path: /root/.cache/go-build settings: rebuild: true mount: @@ -56,4 +66,11 @@ steps: # script: # - cd /your/deploy/path/ # - chmod +x start.sh - # - ./start.sh \ No newline at end of file + # - ./start.sh +volumes: + - name: go-mod-cache + host: + path: /opt/drone/cache/go-mod + - name: go-build-cache + host: + path: /opt/drone/cache/go-build \ No newline at end of file From d4c68baed0dd5618fd42073a7011d3b61dac8cf8 Mon Sep 17 00:00:00 2001 From: hxt Date: Tue, 8 Jul 2025 21:02:12 +0800 Subject: [PATCH 02/10] =?UTF-8?q?ci(drone):=20=E6=B7=BB=E5=8A=A0=20Go=20?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=92=8C=E6=9E=84=E5=BB=BA=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 restore cache 和 rebuild cache 步骤中添加了 go-mod-cache 和 go --- .drone.yml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index cefeef0..f4fb8d8 100644 --- a/.drone.yml +++ b/.drone.yml @@ -16,15 +16,27 @@ steps: - go/pkg/mod - ~/.cache/go-build backend: local - cache_key: go-mod-cache-{{ branch }} + cache_key: go-mod-cache-${DRONE_BRANCH} - name: build image: golang:1.22 commands: + - echo "==== Before build, go/pkg/mod ====" + - ls -lR /go/pkg/mod || echo "/go/pkg/mod not found" + - echo "==== Before build, /root/.cache/go-build ====" + - ls -lR /root/.cache/go-build || echo "/root/.cache/go-build not found" + - echo "==== Before build, /go/.cache/go-build ====" + - ls -lR /go/.cache/go-build || echo "/go/.cache/go-build not found" - go env -w GO111MODULE=on - go env -w GOPROXY=https://goproxy.cn,direct - go mod tidy - go build -o main.exe . + - echo "==== After build, go/pkg/mod ====" + - ls -lR /go/pkg/mod || echo "/go/pkg/mod not found" + - echo "==== After build, /root/.cache/go-build ====" + - ls -lR /root/.cache/go-build || echo "/root/.cache/go-build not found" + - echo "==== After build, /go/.cache/go-build ====" + - ls -lR /go/.cache/go-build || echo "/go/.cache/go-build not found" - name: rebuild cache image: drillster/drone-volume-cache @@ -39,7 +51,7 @@ steps: - go/pkg/mod - ~/.cache/go-build backend: local - cache_key: go-mod-cache-{{ branch }} + cache_key: go-mod-cache-${DRONE_BRANCH} - name: upload image: appleboy/drone-scp From 674ef7a270fca7f8398b478b4bfaeb1177f30aa1 Mon Sep 17 00:00:00 2001 From: hxt Date: Tue, 8 Jul 2025 21:06:33 +0800 Subject: [PATCH 03/10] =?UTF-8?q?ci(drone):=20=E6=B7=BB=E5=8A=A0=20Go=20?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=92=8C=E6=9E=84=E5=BB=BA=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 restore cache 和 rebuild cache 步骤中添加了 go-mod-cache 和 go --- .drone.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index f4fb8d8..ba79345 100644 --- a/.drone.yml +++ b/.drone.yml @@ -13,8 +13,8 @@ steps: settings: restore: true mount: - - go/pkg/mod - - ~/.cache/go-build + - /go/pkg/mod + - /root/.cache/go-build backend: local cache_key: go-mod-cache-${DRONE_BRANCH} @@ -48,8 +48,8 @@ steps: settings: rebuild: true mount: - - go/pkg/mod - - ~/.cache/go-build + - /go/pkg/mod + - /root/.cache/go-build backend: local cache_key: go-mod-cache-${DRONE_BRANCH} From 5f821fe1d17e6a975cff825f151f11670fa85409 Mon Sep 17 00:00:00 2001 From: hxt Date: Tue, 8 Jul 2025 21:12:51 +0800 Subject: [PATCH 04/10] =?UTF-8?q?ci(drone):=20=E6=B7=BB=E5=8A=A0=20Go=20?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=92=8C=E6=9E=84=E5=BB=BA=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 restore cache 和 rebuild cache 步骤中添加了 go-mod-cache 和 go --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index ba79345..3d1bea2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -21,6 +21,7 @@ steps: - name: build image: golang:1.22 commands: + - echo "test" > /go/pkg/mod/testfile - echo "==== Before build, go/pkg/mod ====" - ls -lR /go/pkg/mod || echo "/go/pkg/mod not found" - echo "==== Before build, /root/.cache/go-build ====" From d9384ded4cb93ce06ee98154bb0ee848a2522ffb Mon Sep 17 00:00:00 2001 From: hxt Date: Tue, 8 Jul 2025 21:14:58 +0800 Subject: [PATCH 05/10] =?UTF-8?q?ci(drone):=20=E6=B7=BB=E5=8A=A0=20Go=20?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=92=8C=E6=9E=84=E5=BB=BA=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 restore cache 和 rebuild cache 步骤中添加了 go-mod-cache 和 go --- .drone.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.drone.yml b/.drone.yml index 3d1bea2..cd41783 100644 --- a/.drone.yml +++ b/.drone.yml @@ -21,6 +21,8 @@ steps: - name: build image: golang:1.22 commands: + - mkdir -p /go/pkg/mod + - mkdir -p /root/.cache/go-build - echo "test" > /go/pkg/mod/testfile - echo "==== Before build, go/pkg/mod ====" - ls -lR /go/pkg/mod || echo "/go/pkg/mod not found" From ba41978174169d51f29d818a00a3cdd17341ff40 Mon Sep 17 00:00:00 2001 From: hxt Date: Tue, 8 Jul 2025 21:46:00 +0800 Subject: [PATCH 06/10] =?UTF-8?q?ci(drone):=20=E6=B7=BB=E5=8A=A0=20Go=20?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=92=8C=E6=9E=84=E5=BB=BA=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 restore cache 和 rebuild cache 步骤中添加了 go-mod-cache 和 go --- .drone.yml | 39 ++++++++++++++++----------------------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/.drone.yml b/.drone.yml index cd41783..197c10d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,52 +7,45 @@ steps: image: drillster/drone-volume-cache volumes: - name: go-mod-cache - path: /go/pkg/mod + path: /opt/drone/cache/go-mod - name: go-build-cache - path: /root/.cache/go-build + path: /opt/drone/cache/go-build settings: restore: true mount: - - /go/pkg/mod - - /root/.cache/go-build + - /opt/drone/cache/go-mod + - /opt/drone/cache/go-build backend: local cache_key: go-mod-cache-${DRONE_BRANCH} - name: build image: golang:1.22 commands: - - mkdir -p /go/pkg/mod - - mkdir -p /root/.cache/go-build - - echo "test" > /go/pkg/mod/testfile - - echo "==== Before build, go/pkg/mod ====" - - ls -lR /go/pkg/mod || echo "/go/pkg/mod not found" - - echo "==== Before build, /root/.cache/go-build ====" - - ls -lR /root/.cache/go-build || echo "/root/.cache/go-build not found" - - echo "==== Before build, /go/.cache/go-build ====" - - ls -lR /go/.cache/go-build || echo "/go/.cache/go-build not found" + - mkdir -p /opt/drone/cache/go-mod + - mkdir -p /opt/drone/cache/go-build + - go env -w GOMODCACHE=/opt/drone/cache/go-mod + - go env -w GOCACHE=/opt/drone/cache/go-build - go env -w GO111MODULE=on - go env -w GOPROXY=https://goproxy.cn,direct - go mod tidy - go build -o main.exe . - - echo "==== After build, go/pkg/mod ====" - - ls -lR /go/pkg/mod || echo "/go/pkg/mod not found" - - echo "==== After build, /root/.cache/go-build ====" - - ls -lR /root/.cache/go-build || echo "/root/.cache/go-build not found" - - echo "==== After build, /go/.cache/go-build ====" - - ls -lR /go/.cache/go-build || echo "/go/.cache/go-build not found" + - echo "==== After build, /opt/drone/cache/go-mod ====" + - ls -lR /opt/drone/cache/go-mod || echo "/opt/drone/cache/go-mod not found" + - echo "==== After build, /opt/drone/cache/go-build ====" + - ls -lR /opt/drone/cache/go-build || echo "/opt/drone/cache/go-build not found" - name: rebuild cache image: drillster/drone-volume-cache volumes: - name: go-mod-cache - path: /go/pkg/mod + path: /opt/drone/cache/go-mod - name: go-build-cache - path: /root/.cache/go-build + path: /opt/drone/cache/go-build settings: rebuild: true mount: - - /go/pkg/mod - - /root/.cache/go-build + - /opt/drone/cache/go-mod + - /opt/drone/cache/go-build backend: local cache_key: go-mod-cache-${DRONE_BRANCH} From e95fee2b6303ddb6dbd53d5cbc14bb278e103857 Mon Sep 17 00:00:00 2001 From: hxt Date: Tue, 8 Jul 2025 21:55:22 +0800 Subject: [PATCH 07/10] =?UTF-8?q?ci(drone):=20=E6=B7=BB=E5=8A=A0=20Go=20?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=92=8C=E6=9E=84=E5=BB=BA=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 restore cache 和 rebuild cache 步骤中添加了 go-mod-cache 和 go --- .drone.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.drone.yml b/.drone.yml index 197c10d..c5d474c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -33,6 +33,14 @@ steps: - ls -lR /opt/drone/cache/go-mod || echo "/opt/drone/cache/go-mod not found" - echo "==== After build, /opt/drone/cache/go-build ====" - ls -lR /opt/drone/cache/go-build || echo "/opt/drone/cache/go-build not found" + - echo "==== Whoami and permissions ====" + - whoami + - id + - ls -ld /opt/drone/cache/go-mod + - ls -ld /opt/drone/cache/go-build + - go env GOMODCACHE + - go env GOCACHE + - touch /opt/drone/cache/go-mod/testfile_from_build - name: rebuild cache image: drillster/drone-volume-cache From bd3719ebfcce0834e174b582ea5233d898bf85f0 Mon Sep 17 00:00:00 2001 From: hxt Date: Tue, 8 Jul 2025 22:02:20 +0800 Subject: [PATCH 08/10] =?UTF-8?q?ci(drone):=20=E6=B7=BB=E5=8A=A0=20Go=20?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=92=8C=E6=9E=84=E5=BB=BA=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 restore cache 和 rebuild cache 步骤中添加了 go-mod-cache 和 go --- .drone.yml | 34 ++-------------------------------- 1 file changed, 2 insertions(+), 32 deletions(-) diff --git a/.drone.yml b/.drone.yml index c5d474c..e4f8f92 100644 --- a/.drone.yml +++ b/.drone.yml @@ -22,25 +22,8 @@ steps: image: golang:1.22 commands: - mkdir -p /opt/drone/cache/go-mod - - mkdir -p /opt/drone/cache/go-build - - go env -w GOMODCACHE=/opt/drone/cache/go-mod - - go env -w GOCACHE=/opt/drone/cache/go-build - - go env -w GO111MODULE=on - - go env -w GOPROXY=https://goproxy.cn,direct - - go mod tidy - - go build -o main.exe . - - echo "==== After build, /opt/drone/cache/go-mod ====" - - ls -lR /opt/drone/cache/go-mod || echo "/opt/drone/cache/go-mod not found" - - echo "==== After build, /opt/drone/cache/go-build ====" - - ls -lR /opt/drone/cache/go-build || echo "/opt/drone/cache/go-build not found" - - echo "==== Whoami and permissions ====" - - whoami - - id - - ls -ld /opt/drone/cache/go-mod - - ls -ld /opt/drone/cache/go-build - - go env GOMODCACHE - - go env GOCACHE - - touch /opt/drone/cache/go-mod/testfile_from_build + - echo "drone test" > /opt/drone/cache/go-mod/drone_testfile + - ls -lR /opt/drone/cache/go-mod - name: rebuild cache image: drillster/drone-volume-cache @@ -57,19 +40,6 @@ steps: backend: local cache_key: go-mod-cache-${DRONE_BRANCH} - - name: upload - image: appleboy/drone-scp - settings: - host: 193.112.151.199 - username: root - password: - from_secret: scp_password - port: 222 - source: - - main.exe - - scripts/start.sh - target: /opt/dockeropt/epic-go - # 可选：远程重启服务 # - name: restart # image: appleboy/ssh From 1e738e4c5930f8ebe1e449c6e704f24c77eaab83 Mon Sep 17 00:00:00 2001 From: hxt Date: Tue, 8 Jul 2025 22:07:25 +0800 Subject: [PATCH 09/10] =?UTF-8?q?ci(drone):=20=E6=B7=BB=E5=8A=A0=20Go=20?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=92=8C=E6=9E=84=E5=BB=BA=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 restore cache 和 rebuild cache 步骤中添加了 go-mod-cache 和 go --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index e4f8f92..c9eb537 100644 --- a/.drone.yml +++ b/.drone.yml @@ -33,7 +33,7 @@ steps: - name: go-build-cache path: /opt/drone/cache/go-build settings: - rebuild: true + rebuild: false mount: - /opt/drone/cache/go-mod - /opt/drone/cache/go-build From e1bf7313f313f28d707392878646e72201b69fdb Mon Sep 17 00:00:00 2001 From: hxt Date: Tue, 8 Jul 2025 22:13:42 +0800 Subject: [PATCH 10/10] =?UTF-8?q?ci(drone):=20=E6=B7=BB=E5=8A=A0=20Go=20?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=92=8C=E6=9E=84=E5=BB=BA=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 restore cache 和 rebuild cache 步骤中添加了 go-mod-cache 和 go --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index c9eb537..e4f8f92 100644 --- a/.drone.yml +++ b/.drone.yml @@ -33,7 +33,7 @@ steps: - name: go-build-cache path: /opt/drone/cache/go-build settings: - rebuild: false + rebuild: true mount: - /opt/drone/cache/go-mod - /opt/drone/cache/go-build