From 1c6e639d198925e4fee1e6af6bc87d3b3d8399ef Mon Sep 17 00:00:00 2001 From: wally <18603454788@163.com> Date: Wed, 19 Jan 2022 22:18:53 +0800 Subject: [PATCH 1/7] test drone constants --- .drone.yml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 9d7859c..5de55c8 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,3 +1,16 @@ +# 常量值 +constants: + - &DEVELOPMENT_HOST test.tall.wiki + - &DEVELOPMENT_PORT 22 + - &DEVELOPMENT_CMD + - npm config set registry http://registry.npm.taobao.org + - npm i + - npm run build:test + - &DEVELOPMENT_SCP_TARGET /home/checkwork + - &DEVELOPMENT_SCP_SOURCE dist/* + - &SCP_STRIP_DIR_LEVEL 1 + - &NOTIFY_WECHATROBOT_WEBHOOK https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=428e5c5d-f992-4349-939d-9c99556e50b8 + --- kind: pipeline type: docker @@ -55,7 +68,7 @@ steps: - name: ssh_key path: /root/.ssh/ settings: - host: test.tall.wiki + host: *DEVELOPMENT_HOST port: 22 username: root key_path: /root/.ssh/id_rsa From dc45528bffe62b1cfa05d37cafc96422c3afc9c0 Mon Sep 17 00:00:00 2001 From: wally <18603454788@163.com> Date: Wed, 19 Jan 2022 22:20:43 +0800 Subject: [PATCH 2/7] test ci constants --- .drone.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 5de55c8..536e450 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,3 +1,8 @@ +--- +kind: pipeline +type: docker +name: development + # 常量值 constants: - &DEVELOPMENT_HOST test.tall.wiki @@ -11,10 +16,6 @@ constants: - &SCP_STRIP_DIR_LEVEL 1 - &NOTIFY_WECHATROBOT_WEBHOOK https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=428e5c5d-f992-4349-939d-9c99556e50b8 ---- -kind: pipeline -type: docker -name: development # 挂载的主机卷，可以映射到docker容器中 volumes: From 09b3a9b7fde309a9e3ea274bc4f049b5338b6d85 Mon Sep 17 00:00:00 2001 From: wally <18603454788@163.com> Date: Wed, 19 Jan 2022 22:24:29 +0800 Subject: [PATCH 3/7] update ci development constants --- .drone.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.drone.yml b/.drone.yml index 536e450..9dd1af4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -47,10 +47,7 @@ steps: # volumes: # - name: cache # path: /root/.m2 - commands: - - npm config set registry http://registry.npm.taobao.org - - npm i - - npm run build:test + commands: *DEVELOPMENT_CMD - name: rebuild-cache image: drillster/drone-volume-cache @@ -70,19 +67,19 @@ steps: path: /root/.ssh/ settings: host: *DEVELOPMENT_HOST - port: 22 + port: *DEVELOPMENT_PORT username: root key_path: /root/.ssh/id_rsa rm: true # true则会删除目标目录重建 - target: /home/checkwork - source: dist/* + target: *DEVELOPMENT_SCP_TARGET + source: *DEVELOPMENT_SCP_SOURCE strip_components: 1 # 去除的目录层数，如果没有该选项，则拷贝过去是 target/xxx.jar,1代表去除target - name: notify-wechatwork image: fifsky/drone-wechat-work pull: if-not-exists settings: - url: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=428e5c5d-f992-4349-939d-9c99556e50b8 + url: *NOTIFY_WECHATROBOT_WEBHOOK msgtype: markdown content: | {{if eq .Status "success" }} From df4b62f1a7b07d858c8aeaa234a9ab0d16a93664 Mon Sep 17 00:00:00 2001 From: wally <18603454788@163.com> Date: Wed, 19 Jan 2022 22:32:51 +0800 Subject: [PATCH 4/7] update develop and production ci constants --- .drone.yml | 40 ++++++++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/.drone.yml b/.drone.yml index 9dd1af4..1450fc7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -6,12 +6,14 @@ name: development # 常量值 constants: - &DEVELOPMENT_HOST test.tall.wiki - - &DEVELOPMENT_PORT 22 - &DEVELOPMENT_CMD - npm config set registry http://registry.npm.taobao.org - npm i - npm run build:test - &DEVELOPMENT_SCP_TARGET /home/checkwork + - &DEVELOPMENT_PORT 22 + - &DEVELOPMENT_NODE_VERSION 16 + - &DEVELOPMENT_BRANCH develop - &DEVELOPMENT_SCP_SOURCE dist/* - &SCP_STRIP_DIR_LEVEL 1 - &NOTIFY_WECHATROBOT_WEBHOOK https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=428e5c5d-f992-4349-939d-9c99556e50b8 @@ -42,7 +44,7 @@ steps: - ./node_modules - name: build - image: node:16 + image: node:*DEVELOPMENT_NODE_VERSION pull: if-not-exists # default always # volumes: # - name: cache @@ -101,13 +103,26 @@ steps: trigger: branch: - - develop + - *DEVELOPMENT_BRANCH --- kind: pipeline type: docker name: production +- &PRODUCTION_HOST www.tall.wiki +- &PRODUCTION_CMD + - npm config set registry http://registry.npm.taobao.org + - npm i + - npm run build +- &PRODUCTION_SCP_TARGET /home/checkwork +- &PRODUCTION_BRANCH master +- &PRODUCTION_PORT 22 +- &PRODUCTION_NODE_VERSION 16 +- &PRODUCTION_SCP_SOURCE dist/* +- &SCP_STRIP_DIR_LEVEL 1 +- &NOTIFY_WECHATROBOT_WEBHOOK https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=428e5c5d-f992-4349-939d-9c99556e50b8 + # 挂载的主机卷，可以映射到docker容器中 volumes: # maven构建缓存（宿主机目录） @@ -133,15 +148,12 @@ steps: - ./node_modules - name: build - image: node:16 + image: node:*PRODUCTION_NODE_VERSION pull: if-not-exists # default always # volumes: # - name: cache # path: /root/.m2 - commands: - - npm config set registry http://registry.npm.taobao.org - - npm i - - npm run build + commands: *PRODUCTION_CMD - name: rebuild-cache image: drillster/drone-volume-cache @@ -160,20 +172,20 @@ steps: - name: ssh_key path: /root/.ssh/ settings: - host: www.tall.wiki - port: 22 + host: *PRODUCTION_HOST + port: *PRODUCTION_PORT username: root key_path: /root/.ssh/id_rsa rm: true # true则会删除目标目录重建 - target: /home/checkwork - source: dist/* + target: *PRODUCTION_SCP_TARGET + source: *PRODUCTION_SCP_SOURCE strip_components: 1 # 去除的目录层数，如果没有该选项，则拷贝过去是 target/xxx.jar,1代表去除target - name: notify-wechatwork image: fifsky/drone-wechat-work pull: if-not-exists settings: - url: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=428e5c5d-f992-4349-939d-9c99556e50b8 + url: NOTIFY_WECHATROBOT_WEBHOOK msgtype: markdown content: | {{if eq .Status "success" }} @@ -195,4 +207,4 @@ steps: trigger: branch: - - master + - *PRODUCTION_BRANCH From 6d0ec3d367687e8ff23e790c0c938d586db3556f Mon Sep 17 00:00:00 2001 From: wally <18603454788@163.com> Date: Wed, 19 Jan 2022 22:34:16 +0800 Subject: [PATCH 5/7] fix ci config bug --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 1450fc7..bd1445a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -44,7 +44,7 @@ steps: - ./node_modules - name: build - image: node:*DEVELOPMENT_NODE_VERSION + image: node: *DEVELOPMENT_NODE_VERSION pull: if-not-exists # default always # volumes: # - name: cache @@ -148,7 +148,7 @@ steps: - ./node_modules - name: build - image: node:*PRODUCTION_NODE_VERSION + image: node: *PRODUCTION_NODE_VERSION pull: if-not-exists # default always # volumes: # - name: cache From bd8038219b662e6b37eb2b9b1ecdb9ccd1c3b2d8 Mon Sep 17 00:00:00 2001 From: wally <18603454788@163.com> Date: Wed, 19 Jan 2022 22:37:39 +0800 Subject: [PATCH 6/7] fix ci config bug --- .drone.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index bd1445a..4817520 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,7 +12,7 @@ constants: - npm run build:test - &DEVELOPMENT_SCP_TARGET /home/checkwork - &DEVELOPMENT_PORT 22 - - &DEVELOPMENT_NODE_VERSION 16 + - &DEVELOPMENT_NODE_VERSION node:16 - &DEVELOPMENT_BRANCH develop - &DEVELOPMENT_SCP_SOURCE dist/* - &SCP_STRIP_DIR_LEVEL 1 @@ -44,7 +44,7 @@ steps: - ./node_modules - name: build - image: node: *DEVELOPMENT_NODE_VERSION + image: *DEVELOPMENT_NODE_VERSION pull: if-not-exists # default always # volumes: # - name: cache @@ -118,7 +118,7 @@ name: production - &PRODUCTION_SCP_TARGET /home/checkwork - &PRODUCTION_BRANCH master - &PRODUCTION_PORT 22 -- &PRODUCTION_NODE_VERSION 16 +- &PRODUCTION_NODE_VERSION node:16 - &PRODUCTION_SCP_SOURCE dist/* - &SCP_STRIP_DIR_LEVEL 1 - &NOTIFY_WECHATROBOT_WEBHOOK https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=428e5c5d-f992-4349-939d-9c99556e50b8 @@ -148,7 +148,7 @@ steps: - ./node_modules - name: build - image: node: *PRODUCTION_NODE_VERSION + image: *PRODUCTION_NODE_VERSION pull: if-not-exists # default always # volumes: # - name: cache From cb3844afb16420d35bf657869952b70726acceb0 Mon Sep 17 00:00:00 2001 From: wally <18603454788@163.com> Date: Wed, 19 Jan 2022 22:38:59 +0800 Subject: [PATCH 7/7] fix ci config bug --- .drone.yml | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/.drone.yml b/.drone.yml index 4817520..a2c4d7b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -110,18 +110,20 @@ kind: pipeline type: docker name: production -- &PRODUCTION_HOST www.tall.wiki -- &PRODUCTION_CMD - - npm config set registry http://registry.npm.taobao.org - - npm i - - npm run build -- &PRODUCTION_SCP_TARGET /home/checkwork -- &PRODUCTION_BRANCH master -- &PRODUCTION_PORT 22 -- &PRODUCTION_NODE_VERSION node:16 -- &PRODUCTION_SCP_SOURCE dist/* -- &SCP_STRIP_DIR_LEVEL 1 -- &NOTIFY_WECHATROBOT_WEBHOOK https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=428e5c5d-f992-4349-939d-9c99556e50b8 +# 常量值 +constants: + - &PRODUCTION_HOST www.tall.wiki + - &PRODUCTION_CMD + - npm config set registry http://registry.npm.taobao.org + - npm i + - npm run build + - &PRODUCTION_SCP_TARGET /home/checkwork + - &PRODUCTION_BRANCH master + - &PRODUCTION_PORT 22 + - &PRODUCTION_NODE_VERSION node:16 + - &PRODUCTION_SCP_SOURCE dist/* + - &SCP_STRIP_DIR_LEVEL 1 + - &NOTIFY_WECHATROBOT_WEBHOOK https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=428e5c5d-f992-4349-939d-9c99556e50b8 # 挂载的主机卷，可以映射到docker容器中 volumes: