From 07027667d28493db603e512f39dfdca00f0d971f Mon Sep 17 00:00:00 2001 From: m53297601 <2053003901@qq.com> Date: Fri, 2 Apr 2021 10:50:18 +0800 Subject: [PATCH 01/14] Update '.trustie-pipeline.yml' --- .trustie-pipeline.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.trustie-pipeline.yml b/.trustie-pipeline.yml index f2e056f..8ca4f39 100644 --- a/.trustie-pipeline.yml +++ b/.trustie-pipeline.yml @@ -1,7 +1,7 @@ kind: pipeline type: docker -name: 开发流水线 +name: 测试流水线 platform: os: linux arch: amd64 @@ -50,6 +50,6 @@ steps: - echo ====部署成功====== trigger: branch: - - master + - develop event: - push -- 2.34.1 From 3bf40106ea4625c05a6caab8b17b131cf25fab2b Mon Sep 17 00:00:00 2001 From: p47623895 <18235900245@163.com> Date: Fri, 9 Apr 2021 10:43:38 +0800 Subject: [PATCH 02/14] Update '.trustie-pipeline.yml' --- .trustie-pipeline.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.trustie-pipeline.yml b/.trustie-pipeline.yml index 8ca4f39..36d3c47 100644 --- a/.trustie-pipeline.yml +++ b/.trustie-pipeline.yml @@ -9,6 +9,7 @@ steps: - name: maven image: maven:3-jdk-10 commands: + - ls - mvn install -DskipTests=true # 本模板示例为上传软件包和部署脚本到home目录 # host、username、password可在参数管理中配置 -- 2.34.1 From d57aaf0de7fd2931a78736d7f19a0b8a65c64606 Mon Sep 17 00:00:00 2001 From: p47623895 <18235900245@163.com> Date: Fri, 9 Apr 2021 10:45:05 +0800 Subject: [PATCH 03/14] Update '.trustie-pipeline.yml' --- .trustie-pipeline.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.trustie-pipeline.yml b/.trustie-pipeline.yml index 36d3c47..8ca4f39 100644 --- a/.trustie-pipeline.yml +++ b/.trustie-pipeline.yml @@ -9,7 +9,6 @@ steps: - name: maven image: maven:3-jdk-10 commands: - - ls - mvn install -DskipTests=true # 本模板示例为上传软件包和部署脚本到home目录 # host、username、password可在参数管理中配置 -- 2.34.1 From 2c359e9fcdb4c80e4a08270155267a31c8f10081 Mon Sep 17 00:00:00 2001 From: m53297601 <2053003901@qq.com> Date: Mon, 27 Sep 2021 19:20:33 +0800 Subject: [PATCH 04/14] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index a2a2e86..410bbe9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ # ---> Java # Compiled class file *.class +#.fsl # Log file *.log -- 2.34.1 From f46610fb8ea97bfcc23a67feba1f8a8a67e5a0e8 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Thu, 26 May 2022 09:39:52 +0800 Subject: [PATCH 05/14] Update '.trustie-pipeline.yml' --- .trustie-pipeline.yml | 46 +++++++++++++++---------------------------- 1 file changed, 16 insertions(+), 30 deletions(-) diff --git a/.trustie-pipeline.yml b/.trustie-pipeline.yml index 8ca4f39..72d2de8 100644 --- a/.trustie-pipeline.yml +++ b/.trustie-pipeline.yml @@ -1,53 +1,39 @@ kind: pipeline type: docker -name: 测试流水线 +name: 开发流水线 platform: os: linux arch: amd64 steps: +- name: 编译构建 + image: gcc + commands: + - ./configure + - make - name: maven image: maven:3-jdk-10 commands: - mvn install -DskipTests=true -# 本模板示例为上传软件包和部署脚本到home目录 -# host、username、password可在参数管理中配置 -- name: 上传文件 - image: appleboy/drone-scp - settings: - host: - from_secret: deploy_ip - username: - from_secret: deploy_name - password: - from_secret: deploy_pwd - port: 3522 - command_timeout: 2m - target: /opt/demo - source: - - target/*.war - - Dockerfile +- name: gradle + image: gradle:jdk10 + commands: + - gradle build -x test # 需要将软件包与部署脚本提前上传到远程主机(见文件上传模板) # host、username、password可在参数管理中配置 - name: 远程主机部署 image: appleboy/drone-ssh settings: host: - from_secret: deploy_ip + from_secret: ip username: - from_secret: deploy_name + from_secret: name password: - from_secret: deploy_pwd - port: 3522 + from_secret: pwd + port: 22 script: - - echo ====暂停容器开始11======= - - docker rm -f mo-test - - docker rmi mo-test:1.0 - - cd /opt/demo - - echo ====开始部署======= - - docker build -t mo-test:1.0 . - - docker run -d -p 8080:8080 --name mo-test mo-test:1.0 - - echo ====部署成功====== + - chmod +x /home/deploy.sh + - ./home/deploy.sh trigger: branch: - develop -- 2.34.1 From 5daae2848286c17ed2f1acd3520bb1749655a335 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Thu, 26 May 2022 09:42:58 +0800 Subject: [PATCH 06/14] Add 1.txt --- 1.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 1.txt diff --git a/1.txt b/1.txt new file mode 100644 index 0000000..13301cc --- /dev/null +++ b/1.txt @@ -0,0 +1 @@ +ci test \ No newline at end of file -- 2.34.1 From 13bae69aeb40f56a75394c23b1089325858a848f Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 26 May 2022 09:43:35 +0800 Subject: [PATCH 07/14] Update HelloWorld.java --- src/main/java/controller/HelloWorld.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/controller/HelloWorld.java b/src/main/java/controller/HelloWorld.java index 1a9f2e7..9c53af5 100644 --- a/src/main/java/controller/HelloWorld.java +++ b/src/main/java/controller/HelloWorld.java @@ -14,7 +14,7 @@ public class HelloWorld extends HttpServlet { @Override public void init() throws ServletException { - message = "Hello world, this message is from servlet! Good Luck."; + message = "Hello world, this message is from servlet! Good Luck.a"; } @Override -- 2.34.1 From f88741ed5754ac2dbeb098967040d1fadd3a9ef0 Mon Sep 17 00:00:00 2001 From: xiaoxiaoqiong Date: Sun, 29 May 2022 09:44:39 +0800 Subject: [PATCH 08/14] test --- 1.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/1.txt b/1.txt index 13301cc..6754a09 100644 --- a/1.txt +++ b/1.txt @@ -1 +1,2 @@ -ci test \ No newline at end of file +ci test +error? -- 2.34.1 From 745eb3bacbe7a88f96be1fcb08df813debf3a07c Mon Sep 17 00:00:00 2001 From: xxq250 Date: Mon, 30 May 2022 09:56:56 +0800 Subject: [PATCH 10/14] Update '.trustie-pipeline.yml' --- .trustie-pipeline.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.trustie-pipeline.yml b/.trustie-pipeline.yml index 72d2de8..a6c4337 100644 --- a/.trustie-pipeline.yml +++ b/.trustie-pipeline.yml @@ -1,7 +1,7 @@ kind: pipeline type: docker -name: 开发流水线 +name: dev platform: os: linux arch: amd64 @@ -15,10 +15,6 @@ steps: image: maven:3-jdk-10 commands: - mvn install -DskipTests=true -- name: gradle - image: gradle:jdk10 - commands: - - gradle build -x test # 需要将软件包与部署脚本提前上传到远程主机(见文件上传模板) # host、username、password可在参数管理中配置 - name: 远程主机部署 -- 2.34.1 From a247dc99f52d7be2c6fc2fcd356830256caccd91 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Tue, 31 May 2022 09:21:39 +0800 Subject: [PATCH 11/14] Update 1.txt --- 1.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/1.txt b/1.txt index 6754a09..428bbc9 100644 --- a/1.txt +++ b/1.txt @@ -1,2 +1,3 @@ ci test error? +dev \ No newline at end of file -- 2.34.1 From 603226632030d72c975c8c1e2cdafbfa66dfce08 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Tue, 2 Aug 2022 18:28:16 +0800 Subject: [PATCH 12/14] Update '.trustie-pipeline.yml' --- .trustie-pipeline.yml | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/.trustie-pipeline.yml b/.trustie-pipeline.yml index a6c4337..98fe8dd 100644 --- a/.trustie-pipeline.yml +++ b/.trustie-pipeline.yml @@ -6,30 +6,10 @@ platform: os: linux arch: amd64 steps: -- name: 编译构建 - image: gcc - commands: - - ./configure - - make - name: maven image: maven:3-jdk-10 commands: - mvn install -DskipTests=true -# 需要将软件包与部署脚本提前上传到远程主机(见文件上传模板) -# host、username、password可在参数管理中配置 -- name: 远程主机部署 - image: appleboy/drone-ssh - settings: - host: - from_secret: ip - username: - from_secret: name - password: - from_secret: pwd - port: 22 - script: - - chmod +x /home/deploy.sh - - ./home/deploy.sh trigger: branch: - develop -- 2.34.1 From 416083a14f08dd5b9e639f820d659b32779f232a Mon Sep 17 00:00:00 2001 From: wangwei10061 <153692771@qq.com> Date: Tue, 9 Aug 2022 14:07:24 +0800 Subject: [PATCH 13/14] Update '.trustie-pipeline.yml' --- .trustie-pipeline.yml | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/.trustie-pipeline.yml b/.trustie-pipeline.yml index 98fe8dd..4535c3a 100644 --- a/.trustie-pipeline.yml +++ b/.trustie-pipeline.yml @@ -1,15 +1,31 @@ kind: pipeline type: docker -name: dev +name: develop流水线 platform: os: linux - arch: amd64 + arch: arm64 steps: -- name: maven - image: maven:3-jdk-10 +- name: ruby + image: ruby commands: - - mvn install -DskipTests=true + - bundle install --jobs=3 --retry=3 + - rake +# 需要将软件包与部署脚本提前上传到远程主机(见文件上传模板) +# host、username、password可在参数管理中配置 +- name: 远程主机部署 + image: appleboy/drone-ssh + settings: + host: + from_secret: ip + username: + from_secret: name + password: + from_secret: pwd + port: 22 + script: + - chmod +x /home/deploy.sh + - ./home/deploy.sh trigger: branch: - develop -- 2.34.1 From 8f799ee3d7cae75588bd065594c2b948d2c22ee7 Mon Sep 17 00:00:00 2001 From: wangwei10061 <153692771@qq.com> Date: Tue, 9 Aug 2022 14:13:42 +0800 Subject: [PATCH 14/14] Update '.trustie-pipeline.yml' --- .trustie-pipeline.yml | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/.trustie-pipeline.yml b/.trustie-pipeline.yml index 4535c3a..b0fe1ca 100644 --- a/.trustie-pipeline.yml +++ b/.trustie-pipeline.yml @@ -6,11 +6,22 @@ platform: os: linux arch: arm64 steps: -- name: ruby - image: ruby +- name: maven + image: maven:3-jdk-10 commands: - - bundle install --jobs=3 --retry=3 - - rake + - mvn install -DskipTests=true +- name: maven + image: maven:3-jdk-10 + commands: + - mvn install -DskipTests=true +- name: maven + image: maven:3-jdk-10 + commands: + - mvn install -DskipTests=true +- name: maven + image: maven:3-jdk-10 + commands: + - mvn install -DskipTests=true # 需要将软件包与部署脚本提前上传到远程主机(见文件上传模板) # host、username、password可在参数管理中配置 - name: 远程主机部署 -- 2.34.1