From 9fbae8997f646cffd432c8bd94320a29ae0dfca9 Mon Sep 17 00:00:00 2001 From: wally <18603454788@163.com> Date: Tue, 11 Jan 2022 08:48:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?ci:=20=E6=B7=BB=E5=8A=A0drone.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 145 +++++++++++++++++++++++++++++++++++++++++++++++++++ CHANGELOG.md | 3 +- 2 files changed, 147 insertions(+), 1 deletion(-) create mode 100644 .drone.yml diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..8261895 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,145 @@ +kind: pipeline +type: docker +name: dev + +# 挂载的主机卷，可以映射到docker容器中 +volumes: + # maven构建缓存（宿主机目录） + - name: ssh_key + host: + path: /root/.ssh/ + - name: cache + host: + path: /var/lib/cache + - name: data + host: + path: /var/lib/data + +steps: + - name: restore-cache + image: drillster/drone-volume-cache + volumes: + - name: cache + path: /cache + settings: + restore: true + mount: + - ./node_modules + + - name: build + image: node:latest + pull: if-not-exists # default always + volumes: + - name: cache + path: /root/.m2 + commands: + - npm i + - npm run build:dev + + - name: rebuild-cache + image: drillster/drone-volume-cache + volumes: + - name: cache + path: /cache + settings: + rebuild: true + mount: + - ./node_modules + + - name: deploy-scp + image: appleboy/drone-scp + pull: if-not-exists + volumes: + - name: ssh_key + path: /root/.ssh/ + settings: + host: test.tall.wiki + port: 22 + username: root + key_path: /root/.ssh/id_rsa + rm: true # true则会删除目标目录重建 + target: /home/tall/v4.0.0 + source: dist/**/* + strip_components: 1 # 去除的目录层数，如果没有该选项，则拷贝过去是 target/xxx.jar,1代表去除target + + # - name: run-ssh + # image: appleboy/drone-ssh + # pull: if-not-exists + # volumes: + # - name: ssh_key + # path: /root/.ssh/ + # settings: + # settings: + # host: test.tall.wiki + # port: 22 + # username: root + # key_path: /root/.ssh/id_rsa + # script_stop: true # stop script after first failure + # #command_timeout: 30s # 30seconds, the maximum amount of time for the execute commands, default is 10 minutes. + # script: + # - cd /home/iacd-platform-drone + # - ./re.sh > /dev/null 2> /dev/null & + + - name: notify-email + image: drillster/drone-email + pull: if-not-exists + settings: + host: smtp.qiye.aliyun.com #例如 smtp.qq.com + port: 465 #例如QQ邮箱端口465 + username: devops@ccsens.com #邮箱用户名 + password: #邮箱密码 + from_secret: orgsecret_password_mail_devops + from: devops@ccsens.com + recipients: weizezhao@ccsens.com #收件人，多个用，隔开 + when: #执行条件 + status: + - success + - changed + - failure + + - name: notify-wechatwork + image: fifsky/drone-wechat-work + pull: if-not-exists + settings: + url: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=b2b93e9a-128b-41d4-8dce-12004e3f48b9 + msgtype: markdown + content: | + {{if eq .Status "success" }} + #### 🎉 ${DRONE_REPO} 构建成功 + > Commit: [${DRONE_COMMIT_MESSAGE}](${DRONE_COMMIT_LINK}) + > Author: ${DRONE_COMMIT_AUTHOR} + > [点击查看](${DRONE_BUILD_LINK}) + {{else}} + #### ❌ ${DRONE_REPO} 构建失败 + > Commit: [${DRONE_COMMIT_MESSAGE}](${DRONE_COMMIT_LINK}) + > Author: ${DRONE_COMMIT_AUTHOR} + > 请立即修复!!! + > [点击查看](${DRONE_BUILD_LINK}) + {{end}} + when: + status: + - failure + - success + + # - name: notify-dingtalk + # image: lddsb/drone-dingtalk-message + # environment: + # PASSWORD: + # from_secret: password_mail_devops + # settings: + # token: your-dingtalk-robot-access-token + # type: markdown + # message_color: true + # message_pic: true + # sha_link: true + + # -name: notify-slack + # image: plugins/slack + # webhook: https://hooks.slack.com/ www.dijiuyy.com services/xxx/xxx/xxx + # channel: dev + # template: > + # {{#success build.status}} + # build {{build.number}} succeeded. Good job. + # {{else}} + # build {{build.number}} failed. Fix me please. + # {{/success}} \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 5952d66..48fdbda 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# 1.0.0 (2022-01-10) +# 1.0.0 (2022-01-11) ### 🌟 新功能 范围|描述|commitId @@ -6,6 +6,7 @@ - | app.vue | [970cf9a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/970cf9a) - | first commit | [8dc26de](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8dc26de) project | 日常任务面板添加 | [b3f16ff](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b3f16ff) + theme | theme demo | [9175758](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9175758) - | vue3 | [12ed2ad](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/12ed2ad) - | 使用uview完成api请求 | [1b3efd8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b3efd8) - | 日历页添加 | [1b46a91](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b46a91) From f5b52e355d96a2f8028f7d4c2c731df851c3d8fe Mon Sep 17 00:00:00 2001 From: wally <18603454788@163.com> Date: Tue, 11 Jan 2022 08:56:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?ci:=20=E4=BF=AE=E6=94=B9.drone.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 59 ++++++++++++++++---------------- CHANGELOG.md | 95 ++++++++++++++++++++++++++-------------------------- 2 files changed, 79 insertions(+), 75 deletions(-) diff --git a/.drone.yml b/.drone.yml index 8261895..406b920 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,3 +1,4 @@ +--- kind: pipeline type: docker name: dev @@ -24,14 +25,14 @@ steps: settings: restore: true mount: - - ./node_modules - + - ./node_modules + - name: build image: node:latest pull: if-not-exists # default always volumes: - - name: cache - path: /root/.m2 + - name: cache + path: /root/.m2 commands: - npm i - npm run build:dev @@ -44,24 +45,24 @@ steps: settings: rebuild: true mount: - - ./node_modules + - ./node_modules - name: deploy-scp image: appleboy/drone-scp pull: if-not-exists volumes: - - name: ssh_key - path: /root/.ssh/ + - name: ssh_key + path: /root/.ssh/ settings: - host: test.tall.wiki - port: 22 - username: root - key_path: /root/.ssh/id_rsa - rm: true # true则会删除目标目录重建 - target: /home/tall/v4.0.0 - source: dist/**/* - strip_components: 1 # 去除的目录层数，如果没有该选项，则拷贝过去是 target/xxx.jar,1代表去除target - + host: test.tall.wiki + port: 22 + username: root + key_path: /root/.ssh/id_rsa + rm: true # true则会删除目标目录重建 + target: /home/tall/v4.0.0 + source: dist/**/* + strip_components: 1 # 去除的目录层数，如果没有该选项，则拷贝过去是 target/xxx.jar,1代表去除target + # - name: run-ssh # image: appleboy/drone-ssh # pull: if-not-exists @@ -79,23 +80,23 @@ steps: # script: # - cd /home/iacd-platform-drone # - ./re.sh > /dev/null 2> /dev/null & - + - name: notify-email image: drillster/drone-email pull: if-not-exists settings: - host: smtp.qiye.aliyun.com #例如 smtp.qq.com - port: 465 #例如QQ邮箱端口465 - username: devops@ccsens.com #邮箱用户名 - password: #邮箱密码 + host: smtp.qiye.aliyun.com #例如 smtp.qq.com + port: 465 #例如QQ邮箱端口465 + username: devops@ccsens.com #邮箱用户名 + password: #邮箱密码 from_secret: orgsecret_password_mail_devops from: devops@ccsens.com - recipients: weizezhao@ccsens.com #收件人，多个用，隔开 - when: #执行条件 - status: - - success - - changed - - failure + recipients: weizezhao@ccsens.com #收件人，多个用，隔开 + when: #执行条件 + status: + - success + - changed + - failure - name: notify-wechatwork image: fifsky/drone-wechat-work @@ -121,6 +122,8 @@ steps: - failure - success +trigger: + branch: develop # - name: notify-dingtalk # image: lddsb/drone-dingtalk-message # environment: @@ -142,4 +145,4 @@ steps: # build {{build.number}} succeeded. Good job. # {{else}} # build {{build.number}} failed. Fix me please. - # {{/success}} \ No newline at end of file + # {{/success}} diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b787c5..9f3f357 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,67 +1,68 @@ # 1.0.0 (2022-01-11) ### 🌟 新功能 +范围|描述|commitId +--|--|-- + - | app.vue | [970cf9a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/970cf9a) + - | first commit | [8dc26de](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8dc26de) + project | 日常任务面板添加 | [b3f16ff](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b3f16ff) + theme | theme demo | [9175758](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9175758) + - | vue3 | [12ed2ad](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/12ed2ad) + - | 使用uview完成api请求 | [1b3efd8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b3efd8) + - | 日历页添加 | [1b46a91](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b46a91) + - | 日历页首页 | [561c8e6](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/561c8e6) + - | 时间轴展示 | [8b1b380](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8b1b380) + - | 时间轴接口 | [a95d005](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a95d005) + - | 时间轴页面 | [e926b75](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/e926b75) + - | 更新代码 | [392c8cc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/392c8cc) + - | 添加 timeline | [72dad2b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/72dad2b) + - | 表单验证 | [8f3bc1e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f3bc1e) + - | 账户名密码登录 | [ebf456e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/ebf456e) + - | 项目列表 | [a52e6d5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a52e6d5) + - | 项目操作面板 | [3beb05e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3beb05e) -| 范围 | 描述 | commitId | -| ------- | ------------------------ | ------------------------------------------------------------------------ | -| - | app.vue | [970cf9a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/970cf9a) | -| - | first commit | [8dc26de](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8dc26de) | -| project | 日常任务面板添加 | [b3f16ff](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b3f16ff) | -| theme | theme demo | [9175758](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9175758) | -| - | vue3 | [12ed2ad](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/12ed2ad) | -| - | 使用 uview 完成 api 请求 | [1b3efd8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b3efd8) | -| - | 日历页添加 | [1b46a91](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b46a91) | -| - | 表单验证 | [8f3bc1e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8f3bc1e) | -| - | 更新代码 | [392c8cc](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/392c8cc) | -| - | 日历页首页 | [561c8e6](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/561c8e6) | -| - | 日历页添加 | [1b46a91](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b46a91) | -| - | 时间轴接口 | [a95d005](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a95d005) | -| - | 时间轴页面 | [e926b75](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/e926b75) | -| - | 使用 uview 完成 api 请求 | [1b3efd8](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1b3efd8) | -| - | 添加 timeline | [72dad2b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/72dad2b) | -| - | 项目操作面板 | [3beb05e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3beb05e) | -| - | 项目列表 | [a52e6d5](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/a52e6d5) | -| - | 账户名密码登录 | [ebf456e](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/ebf456e) | -| - | app.vue | [970cf9a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/970cf9a) | -| - | first commit | [8dc26de](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8dc26de) | -| project | 日常任务面板添加 | [b3f16ff](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b3f16ff) | -| theme | theme demo | [9175758](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9175758) | -| - | vue3 | [12ed2ad](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/12ed2ad) | ### 🎨 代码样式 +范围|描述|commitId +--|--|-- + - | calender格式及细节调整 | [db9602b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/db9602b) + - | 细节调整 | [bdd5f87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/bdd5f87) -| 范围 | 描述 | commitId | -| ---- | ----------------------- | ------------------------------------------------------------------------ | -| - | 细节调整 | [bdd5f87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/bdd5f87) | -| - | calender 格式及细节调整 | [db9602b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/db9602b) | ### 🐛 Bug 修复 +范围|描述|commitId +--|--|-- + app.vue | 修复获取token报错的问题 | [9120d54](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9120d54) + createTask | 修复createTask v-model的问题 | [b20d3f0](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b20d3f0) + - | 修复一些内容 | [3cdb1ce](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3cdb1ce) + + +### 📦 持续集成 +范围|描述|commitId +--|--|-- + - | 添加drone.yml | [9fbae89](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9fbae89) -| 范围 | 描述 | commitId | -| ---------- | ------------------------------ | ------------------------------------------------------------------------ | -| - | 修复一些内容 | [3cdb1ce](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3cdb1ce) | -| app.vue | 修复获取 token 报错的问题 | [9120d54](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9120d54) | -| createTask | 修复 createTask v-model 的问题 | [b20d3f0](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b20d3f0) | ### 🔨 代码重构 +范围|描述|commitId +--|--|-- + - | project init 重构 | [2457a87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/2457a87) + - | 重构project init 部分 | [c7bf2df](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/c7bf2df) -| 范围 | 描述 | commitId | -| ---- | ---------------------- | ------------------------------------------------------------------------ | -| - | 重构 project init 部分 | [c7bf2df](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/c7bf2df) | -| - | project init 重构 | [2457a87](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/2457a87) | ### 🚀 性能优化 +范围|描述|commitId +--|--|-- + - | 更新代码 | [0dd443b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0dd443b) -| 范围 | 描述 | commitId | -| ---- | -------- | ------------------------------------------------------------------------ | -| - | 更新代码 | [0dd443b](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0dd443b) | ### chore +范围|描述|commitId +--|--|-- + - | editorconfig update | [0c08089](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0c08089) + -| 范围 | 描述 | commitId | -| ---- | ------------------- | ------------------------------------------------------------------------ | -| - | editorconfig update | [0c08089](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0c08089) | +范围|描述|commitId +--|--|-- + - | Initial commit | [52b8f49](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/52b8f49) -| 范围 | 描述 | commitId | -| ---- | -------------- | ------------------------------------------------------------------------ | -| - | Initial commit | [52b8f49](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/52b8f49) |