From b42324c2ccd4f8a6dd2073a34a78a774802bc119 Mon Sep 17 00:00:00 2001 From: p15478209 <1149225589@qq.com> Date: Fri, 2 Apr 2021 11:31:03 +0800 Subject: [PATCH 01/58] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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..bc82721 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! "; } @Override -- 2.34.1 From 40ba627dfe2062794e897ac2438416c7026483f0 Mon Sep 17 00:00:00 2001 From: Hjqreturn Date: Fri, 2 Apr 2021 13:48:56 +0800 Subject: [PATCH 02/58] add --- 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 bc82721..9eb7e29 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! "; + message = "Hello world, this message is from servlet! success"; } @Override -- 2.34.1 From b43cfd47b4d654e3fe7db2bea1b081315b899405 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Fri, 2 Apr 2021 13:53:59 +0800 Subject: [PATCH 03/58] 111 --- 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 9eb7e29..ee3fcc2 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! success"; + message = "Hello world, this message is from servlet! success！"; } @Override -- 2.34.1 From d1b413851383cab274bfd7cae38b0d7eb4956498 Mon Sep 17 00:00:00 2001 From: m53297601 <2053003901@qq.com> Date: Wed, 7 Apr 2021 17:09:50 +0800 Subject: [PATCH 04/58] update --- 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 ee3fcc2..8f65637 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! success！"; + message = "Hello world, this message is from servlet!"; } @Override -- 2.34.1 From 76c8b3e492b5990b4058e547fe753932409f90f0 Mon Sep 17 00:00:00 2001 From: m53297601 <2053003901@qq.com> Date: Mon, 2 Aug 2021 16:43:45 +0800 Subject: [PATCH 05/58] 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 8f65637..6b6873d 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!"; + message = "Hello world, this message is from servlet! last mody"; } @Override -- 2.34.1 From d966f053840223482bacb6c78c099a35176b0e60 Mon Sep 17 00:00:00 2001 From: m53297601 <2053003901@qq.com> Date: Tue, 3 Aug 2021 09:23:53 +0800 Subject: [PATCH 06/58] Update pom.xml --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index abb6bac..2db9b9e 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.example -- 2.34.1 From 1aabaa3be5706230c7ddcda56f6ee9e01db39b46 Mon Sep 17 00:00:00 2001 From: m53297601 <2053003901@qq.com> Date: Tue, 3 Aug 2021 09:43:10 +0800 Subject: [PATCH 07/58] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index a2a2e86..7cff0f3 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* +*.mac -- 2.34.1 From c0c3c63abcd2712756a1499efc211ae0a956e030 Mon Sep 17 00:00:00 2001 From: m53297601 <2053003901@qq.com> Date: Thu, 19 Aug 2021 20:52:41 +0800 Subject: [PATCH 08/58] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 7cff0f3..fc34ba7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ # ---> Java # Compiled class file +fsf *.class # Log file -- 2.34.1 From 1b7925ce926761e66021a7f143b044080e49ba1c Mon Sep 17 00:00:00 2001 From: m53297601 <2053003901@qq.com> Date: Thu, 19 Aug 2021 20:54:58 +0800 Subject: [PATCH 09/58] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 3bd41fc..93271ca 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,15 @@ -## 操作步骤 +## 操作步骤11 #### 1. 在线修改信息 src/main/java/controller/HelloWorld.java 文件信息内容,如下图: ![](https://forge.educoder.net/api/attachments/1663370?raw=true) #### 2. 修改成功后，会自动出发构建、自动测试、自动部署 -![](https://forge.educoder.net/api/attachments/1663375) +![](https://forge.educoder.net/api/attachments/1663375?raw=true) #### 3. 构建成功后，访问如下链接，即可查看效果 http://106.75.236.63:8080/demo/hello -![](https://forge.educoder.net/api/attachments/1663377) +![](https://forge.educoder.net/api/attachments/1663377?raw=true) -- 2.34.1 From 4f5ccf33d1893a8a4d85b4a242f4c027bdf261b2 Mon Sep 17 00:00:00 2001 From: m53297601 <2053003901@qq.com> Date: Tue, 24 Aug 2021 17:39:36 +0800 Subject: [PATCH 10/58] Add hello_world.java --- hello_world.java | 1 + 1 file changed, 1 insertion(+) create mode 100644 hello_world.java diff --git a/hello_world.java b/hello_world.java new file mode 100644 index 0000000..bf0a747 --- /dev/null +++ b/hello_world.java @@ -0,0 +1 @@ +hello world java \ No newline at end of file -- 2.34.1 From 82bed39df36901366c5004eae093225b543cd2b8 Mon Sep 17 00:00:00 2001 From: m53297601 <2053003901@qq.com> Date: Mon, 27 Sep 2021 19:19:39 +0800 Subject: [PATCH 11/58] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index fc34ba7..68dbb7f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ # ---> Java +# # Compiled class file fsf *.class -- 2.34.1 From cdc5caea3fb74490da51a0df60347878185d264d Mon Sep 17 00:00:00 2001 From: m53297601 <2053003901@qq.com> Date: Tue, 28 Sep 2021 06:37:13 +0800 Subject: [PATCH 12/58] Update pom.xml --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 2db9b9e..1267759 100644 --- a/pom.xml +++ b/pom.xml @@ -9,6 +9,7 @@ 1 demo war + war 1.8 -- 2.34.1 From ea1152503ea1335e8a428dfd538976d1ff8ea1b6 Mon Sep 17 00:00:00 2001 From: m53297601 <2053003901@qq.com> Date: Tue, 28 Sep 2021 06:38:02 +0800 Subject: [PATCH 13/58] Update pom.xml --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1267759..2db9b9e 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,6 @@ 1 demo war - war 1.8 -- 2.34.1 From 5a45a5280be03648d1f45d623892510c0ca264a4 Mon Sep 17 00:00:00 2001 From: m53297601 <2053003901@qq.com> Date: Tue, 28 Sep 2021 06:53:42 +0800 Subject: [PATCH 14/58] Update pom.xml --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 2db9b9e..1267759 100644 --- a/pom.xml +++ b/pom.xml @@ -9,6 +9,7 @@ 1 demo war + war 1.8 -- 2.34.1 From 582dc8904cede6aeb194d6f255cf44cac6a105f1 Mon Sep 17 00:00:00 2001 From: m53297601 <2053003901@qq.com> Date: Tue, 28 Sep 2021 06:54:55 +0800 Subject: [PATCH 15/58] Update pom.xml --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1267759..2db9b9e 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,6 @@ 1 demo war - war 1.8 -- 2.34.1 From 137cb81c25465a0e1bbf9543e0560ec4abd9ff3d Mon Sep 17 00:00:00 2001 From: m53297601 <2053003901@qq.com> Date: Tue, 28 Sep 2021 07:05:12 +0800 Subject: [PATCH 16/58] Update pom.xml --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 2db9b9e..3a2070a 100644 --- a/pom.xml +++ b/pom.xml @@ -9,6 +9,7 @@ 1 demo war + war 1.8 -- 2.34.1 From 7210c27b9e81541768c183285973978d1b2eeb79 Mon Sep 17 00:00:00 2001 From: m53297601 <2053003901@qq.com> Date: Tue, 28 Sep 2021 09:06:06 +0800 Subject: [PATCH 17/58] Update .trustie-pipeline.yml --- .trustie-pipeline.yml | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/.trustie-pipeline.yml b/.trustie-pipeline.yml index f2e056f..24a6a04 100644 --- a/.trustie-pipeline.yml +++ b/.trustie-pipeline.yml @@ -1,15 +1,15 @@ - + kind: pipeline type: docker name: 开发流水线 platform: os: linux - arch: amd64 -steps: + arch: amd64 +steps: - name: maven image: maven:3-jdk-10 commands: - - mvn install -DskipTests=true + - mvn install -DskipTests=true # 本模板示例为上传软件包和部署脚本到home目录 # host、username、password可在参数管理中配置 - name: 上传文件 @@ -26,7 +26,7 @@ steps: target: /opt/demo source: - target/*.war - - Dockerfile + - Dockerfile # 需要将软件包与部署脚本提前上传到远程主机(见文件上传模板) # host、username、password可在参数管理中配置 - name: 远程主机部署 @@ -47,9 +47,4 @@ steps: - echo ====开始部署======= - docker build -t mo-test:1.0 . - docker run -d -p 8080:8080 --name mo-test mo-test:1.0 - - echo ====部署成功====== -trigger: - branch: - - master - event: - - push + - echo ====部署成功====== -- 2.34.1 From d3902eeafca89c1a20996a7f7f2cbe46a0f87b5e Mon Sep 17 00:00:00 2001 From: m53297601 <2053003901@qq.com> Date: Tue, 28 Sep 2021 11:30:39 +0800 Subject: [PATCH 18/58] Update .trustie-pipeline.yml --- .trustie-pipeline.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.trustie-pipeline.yml b/.trustie-pipeline.yml index 24a6a04..ac8626e 100644 --- a/.trustie-pipeline.yml +++ b/.trustie-pipeline.yml @@ -1,4 +1,3 @@ - kind: pipeline type: docker name: 开发流水线 @@ -47,4 +46,4 @@ steps: - echo ====开始部署======= - docker build -t mo-test:1.0 . - docker run -d -p 8080:8080 --name mo-test mo-test:1.0 - - echo ====部署成功====== + - echo ====部署成功====== \ No newline at end of file -- 2.34.1 From 1b56c0c2a71b94a69f0964b5b70bf25e16e1458c Mon Sep 17 00:00:00 2001 From: xxq250 Date: Thu, 26 May 2022 09:42:34 +0800 Subject: [PATCH 19/58] 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 b553944925a86b1d96033330d74545405fafa4dc Mon Sep 17 00:00:00 2001 From: xxq250 Date: Mon, 30 May 2022 09:48:23 +0800 Subject: [PATCH 20/58] Update '.trustie-pipeline.yml' --- .trustie-pipeline.yml | 58 +++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 33 deletions(-) diff --git a/.trustie-pipeline.yml b/.trustie-pipeline.yml index ac8626e..3ed7e48 100644 --- a/.trustie-pipeline.yml +++ b/.trustie-pipeline.yml @@ -1,49 +1,41 @@ + kind: pipeline type: docker -name: 开发流水线 +name: master platform: os: linux - arch: amd64 -steps: + 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 + - mvn install -DskipTests=true +- 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 ====部署成功====== \ No newline at end of file + - chmod +x /home/deploy.sh + - ./home/deploy.sh +trigger: + branch: + - master + event: + - push -- 2.34.1 From cd184c828c11dc48b5ba1c853f2f9a0756986baa Mon Sep 17 00:00:00 2001 From: xxq250 Date: Mon, 30 May 2022 09:48:51 +0800 Subject: [PATCH 21/58] Update 1.txt --- 1.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/1.txt b/1.txt index 13301cc..a3cae96 100644 --- a/1.txt +++ b/1.txt @@ -1 +1,2 @@ -ci test \ No newline at end of file +ci test +java jar \ No newline at end of file -- 2.34.1 From 6b6b4427cd5aa3d95ed393b8108018cb1f932dd5 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Mon, 30 May 2022 09:58:50 +0800 Subject: [PATCH 22/58] Update 1.txt --- 1.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/1.txt b/1.txt index a3cae96..80d48b5 100644 --- a/1.txt +++ b/1.txt @@ -1,2 +1,3 @@ ci test -java jar \ No newline at end of file +java jar +123123 \ No newline at end of file -- 2.34.1 From eebac6e65381a4082d973226301898fc49706b08 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Mon, 30 May 2022 10:01:20 +0800 Subject: [PATCH 23/58] Update '.trustie-pipeline.yml' --- .trustie-pipeline.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.trustie-pipeline.yml b/.trustie-pipeline.yml index 3ed7e48..823e7aa 100644 --- a/.trustie-pipeline.yml +++ b/.trustie-pipeline.yml @@ -6,11 +6,6 @@ platform: os: linux arch: amd64 steps: -- name: 编译 - image: gcc - commands: - - ./configure - - make - name: maven image: maven:3-jdk-10 commands: -- 2.34.1 From 181cb12915734f1ee8188e946c3087d5661a1424 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Mon, 30 May 2022 14:54:00 +0800 Subject: [PATCH 24/58] Update '.trustie-pipeline.yml' --- .trustie-pipeline.yml | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/.trustie-pipeline.yml b/.trustie-pipeline.yml index 823e7aa..0ab6f63 100644 --- a/.trustie-pipeline.yml +++ b/.trustie-pipeline.yml @@ -10,25 +10,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: 远程主机部署 - 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: - master -- 2.34.1 From c511b6a32c67987386beceea147b1e27294edf05 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Mon, 30 May 2022 14:54:17 +0800 Subject: [PATCH 25/58] Update 1.txt --- 1.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/1.txt b/1.txt index 80d48b5..243e5ca 100644 --- a/1.txt +++ b/1.txt @@ -1,3 +1,4 @@ ci test java jar -123123 \ No newline at end of file +123123 +123 \ No newline at end of file -- 2.34.1 From e40ad7bdf4eded5ba193d2c198a60c8ae285df0d Mon Sep 17 00:00:00 2001 From: xxq250 Date: Tue, 31 May 2022 10:10:42 +0800 Subject: [PATCH 26/58] Update mvn jdk --- .trustie-pipeline.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.trustie-pipeline.yml b/.trustie-pipeline.yml index 0ab6f63..642cdd0 100644 --- a/.trustie-pipeline.yml +++ b/.trustie-pipeline.yml @@ -1,17 +1,17 @@ -kind: pipeline -type: docker -name: master -platform: - os: linux +kind: pipeline +type: docker +name: master +platform: + os: linux arch: amd64 steps: -- name: maven - image: maven:3-jdk-10 - commands: +- name: maven + image: maven:3.6.3-jdk-11 + commands: - mvn install -DskipTests=true -trigger: - branch: - - master - event: - - push +trigger: + branch: + - master + event: + - push -- 2.34.1 From 1bc0eab95540c11a807d5d2717a900d0d682a5c8 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Tue, 31 May 2022 17:59:31 +0800 Subject: [PATCH 27/58] Update .trustie-pipeline.yml --- .trustie-pipeline.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.trustie-pipeline.yml b/.trustie-pipeline.yml index 642cdd0..89dd3d1 100644 --- a/.trustie-pipeline.yml +++ b/.trustie-pipeline.yml @@ -7,9 +7,10 @@ platform: arch: amd64 steps: - name: maven - image: maven:3.6.3-jdk-11 + image: maven:3-jdk-10 commands: - - mvn install -DskipTests=true + - mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V + - mvn test -B trigger: branch: - master -- 2.34.1 From 81c8c260ee4d6e54fdee9a46b2f2d99495abd3cc Mon Sep 17 00:00:00 2001 From: xxq250 Date: Tue, 31 May 2022 18:22:16 +0800 Subject: [PATCH 28/58] Update pom.xml --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3a2070a..2db9b9e 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,6 @@ 1 demo war - war 1.8 -- 2.34.1 From 71eca307e635e16ceb24dc93357eaef2b8473da4 Mon Sep 17 00:00:00 2001 From: wangwei10061 <153692771@qq.com> Date: Wed, 27 Jul 2022 18:25:22 +0800 Subject: [PATCH 29/58] Update '.trustie-pipeline.yml' --- .trustie-pipeline.yml | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/.trustie-pipeline.yml b/.trustie-pipeline.yml index 89dd3d1..9520a10 100644 --- a/.trustie-pipeline.yml +++ b/.trustie-pipeline.yml @@ -1,18 +1,21 @@ -kind: pipeline -type: docker -name: master -platform: - os: linux - arch: amd64 +kind: pipeline +type: docker +name: master +platform: + os: linux + arch: arm64 steps: -- name: maven - image: maven:3-jdk-10 - commands: - - mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V - - mvn test -B -trigger: - branch: - - master - event: - - push +- name: maven + image: maven:3-jdk-10 + commands: + - mvn install -DskipTests=true +- name: maven + image: maven:3-jdk-10 + commands: + - mvn install -DskipTests=true +trigger: + branch: + - master + event: + - push -- 2.34.1 From 68e0dbf2be2bacff34e2db57af8cf1b24ccd2066 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Tue, 2 Aug 2022 14:26:48 +0800 Subject: [PATCH 31/58] Update 1.txt --- 1.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/1.txt b/1.txt index 243e5ca..9c31d00 100644 --- a/1.txt +++ b/1.txt @@ -1,4 +1,7 @@ ci test java jar 123123 -123 \ No newline at end of file +123 + +sdfasdf +sdf \ No newline at end of file -- 2.34.1 From b9b5dfe59a1a8d43409e66ab7610d5e8e8796577 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Tue, 2 Aug 2022 17:30:30 +0800 Subject: [PATCH 32/58] Update '.trustie-pipeline.yml' --- .trustie-pipeline.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.trustie-pipeline.yml b/.trustie-pipeline.yml index 9520a10..488e64b 100644 --- a/.trustie-pipeline.yml +++ b/.trustie-pipeline.yml @@ -1,15 +1,11 @@ kind: pipeline type: docker -name: master +name: 开发 platform: os: linux - arch: arm64 + arch: amd64 steps: -- name: maven - image: maven:3-jdk-10 - commands: - - mvn install -DskipTests=true - name: maven image: maven:3-jdk-10 commands: -- 2.34.1 From 039a3428f3cb4e8f2e8ff7e64a3198f5ebedfd38 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Tue, 2 Aug 2022 17:30:46 +0800 Subject: [PATCH 33/58] Update 1.txt --- 1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/1.txt b/1.txt index 9c31d00..eab8650 100644 --- a/1.txt +++ b/1.txt @@ -4,4 +4,4 @@ java jar 123 sdfasdf -sdf \ No newline at end of file +sdf123123 \ No newline at end of file -- 2.34.1 From 4de0d0ce21135b5ac1e68cb3a173bd2ab917a397 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Tue, 2 Aug 2022 17:31:55 +0800 Subject: [PATCH 34/58] Update '.trustie-pipeline.yml' --- .trustie-pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.trustie-pipeline.yml b/.trustie-pipeline.yml index 488e64b..0ab6f63 100644 --- a/.trustie-pipeline.yml +++ b/.trustie-pipeline.yml @@ -1,7 +1,7 @@ kind: pipeline type: docker -name: 开发 +name: master platform: os: linux arch: amd64 -- 2.34.1 From f8fc4ef94947a22fe0da1f00746a503bc57d3f08 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Tue, 2 Aug 2022 18:15:02 +0800 Subject: [PATCH 35/58] Update 1.txt --- 1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/1.txt b/1.txt index eab8650..45d7d22 100644 --- a/1.txt +++ b/1.txt @@ -4,4 +4,4 @@ java jar 123 sdfasdf -sdf123123 \ No newline at end of file +sdf123123123123 \ No newline at end of file -- 2.34.1 From da1776429fc03789a80675e04ed1a5360b839950 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Wed, 3 Aug 2022 15:40:22 +0800 Subject: [PATCH 37/58] Update '.trustie-pipeline.yml' --- .trustie-pipeline.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.trustie-pipeline.yml b/.trustie-pipeline.yml index 0ab6f63..10e5204 100644 --- a/.trustie-pipeline.yml +++ b/.trustie-pipeline.yml @@ -10,6 +10,21 @@ steps: 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: - master -- 2.34.1 From 6630e6454f245c521b13a72c792c78a1b0b9b523 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Wed, 3 Aug 2022 15:55:35 +0800 Subject: [PATCH 38/58] Update '.trustie-pipeline.yml' --- .trustie-pipeline.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/.trustie-pipeline.yml b/.trustie-pipeline.yml index 10e5204..0ab6f63 100644 --- a/.trustie-pipeline.yml +++ b/.trustie-pipeline.yml @@ -10,21 +10,6 @@ steps: 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: - master -- 2.34.1 From 5cd9db33f542979b5597b1cf5b713d62b29e760f Mon Sep 17 00:00:00 2001 From: xxq250 Date: Tue, 16 Aug 2022 16:54:15 +0800 Subject: [PATCH 39/58] =?UTF-8?q?feat:=20.devops/=E6=9C=AA=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E9=A1=B9=E7=9B=AE.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devops/未命名项目.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .devops/未命名项目.yml diff --git a/.devops/未命名项目.yml b/.devops/未命名项目.yml new file mode 100644 index 0000000..bc7d4de --- /dev/null +++ b/.devops/未命名项目.yml @@ -0,0 +1,27 @@ +version: 2 +name: 未命名项目 +description: "" +global: + concurrent: false +trigger: + webhook: gitlink@1.0.0 + event: + - ref: push + ruleset-operator: AND +workflow: + - ref: start + name: 开始 + task: start + - ref: shell_0 + name: shell + image: ubuntu:22.10 + script: + - echo "hello word" + needs: + - start + - ref: end + name: 结束 + task: end + needs: + - shell_0 + -- 2.34.1 From 18f37c18744dc54b4a394b5a3528d4218a177e90 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Tue, 16 Aug 2022 16:55:10 +0800 Subject: [PATCH 40/58] =?UTF-8?q?refactor:=20delete=20.devops/=E6=9C=AA?= =?UTF-8?q?=E5=91=BD=E5=90=8D=E9=A1=B9=E7=9B=AE.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devops/未命名项目.yml | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 .devops/未命名项目.yml diff --git a/.devops/未命名项目.yml b/.devops/未命名项目.yml deleted file mode 100644 index bc7d4de..0000000 --- a/.devops/未命名项目.yml +++ /dev/null @@ -1,27 +0,0 @@ -version: 2 -name: 未命名项目 -description: "" -global: - concurrent: false -trigger: - webhook: gitlink@1.0.0 - event: - - ref: push - ruleset-operator: AND -workflow: - - ref: start - name: 开始 - task: start - - ref: shell_0 - name: shell - image: ubuntu:22.10 - script: - - echo "hello word" - needs: - - start - - ref: end - name: 结束 - task: end - needs: - - shell_0 - -- 2.34.1 From 1dfd66e6e2d9d94c7491efe59a32c8046c6a6bed Mon Sep 17 00:00:00 2001 From: xxq250 Date: Tue, 16 Aug 2022 16:55:11 +0800 Subject: [PATCH 41/58] feat: .devops/Hello Word.yml --- .devops/Hello Word.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .devops/Hello Word.yml diff --git a/.devops/Hello Word.yml b/.devops/Hello Word.yml new file mode 100644 index 0000000..a64c0e9 --- /dev/null +++ b/.devops/Hello Word.yml @@ -0,0 +1,27 @@ +version: 2 +name: Hello Word +description: hello jianmu +global: + concurrent: false +trigger: + webhook: gitlink@1.0.0 + event: + - ref: push + ruleset-operator: AND +workflow: + - ref: start + name: 开始 + task: start + - ref: shell_0 + name: shell + image: ubuntu:22.10 + script: + - echo "hello word" + needs: + - start + - ref: end + name: 结束 + task: end + needs: + - shell_0 + -- 2.34.1 From 45583cfd74b9e4ce3b35b4e7c05ec8001785511a Mon Sep 17 00:00:00 2001 From: xxq250 Date: Wed, 8 Feb 2023 09:24:37 +0800 Subject: [PATCH 42/58] Add 2.txt --- 2.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 2.txt diff --git a/2.txt b/2.txt new file mode 100644 index 0000000..93a5f6a --- /dev/null +++ b/2.txt @@ -0,0 +1 @@ +123123 \ No newline at end of file -- 2.34.1 From 3d081d36ab3698f6660e85dc7f144d74ce76ae08 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Thu, 16 Mar 2023 10:15:38 +0800 Subject: [PATCH 43/58] refactor: delete .devops/Hello Word.yml --- .devops/Hello Word.yml | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 .devops/Hello Word.yml diff --git a/.devops/Hello Word.yml b/.devops/Hello Word.yml deleted file mode 100644 index a64c0e9..0000000 --- a/.devops/Hello Word.yml +++ /dev/null @@ -1,27 +0,0 @@ -version: 2 -name: Hello Word -description: hello jianmu -global: - concurrent: false -trigger: - webhook: gitlink@1.0.0 - event: - - ref: push - ruleset-operator: AND -workflow: - - ref: start - name: 开始 - task: start - - ref: shell_0 - name: shell - image: ubuntu:22.10 - script: - - echo "hello word" - needs: - - start - - ref: end - name: 结束 - task: end - needs: - - shell_0 - -- 2.34.1 From 439e50804a2c0a1a4b54bba981b6fbcd148c7ef6 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Thu, 16 Mar 2023 10:15:39 +0800 Subject: [PATCH 44/58] =?UTF-8?q?feat:=20.devops/PR=E9=80=9A=E7=9F=A5.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devops/PR通知.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .devops/PR通知.yml diff --git a/.devops/PR通知.yml b/.devops/PR通知.yml new file mode 100644 index 0000000..014c51e --- /dev/null +++ b/.devops/PR通知.yml @@ -0,0 +1,27 @@ +version: 2 +name: PR通知 +description: 新的PR提交会有钉钉通知 +global: + concurrent: false +trigger: + webhook: gitlink@1.0.0 + event: + - ref: pr + ruleset-operator: AND +workflow: + - ref: start + name: 开始 + task: start + - ref: shell_0 + name: shell + image: ubuntu:22.10 + script: + - echo "hello word" + needs: + - start + - ref: end + name: 结束 + task: end + needs: + - shell_0 + -- 2.34.1 From 1518d159c9d37adf6469b0d34eae97b4a740ebfa Mon Sep 17 00:00:00 2001 From: xxq250 Date: Thu, 16 Mar 2023 10:26:39 +0800 Subject: [PATCH 45/58] =?UTF-8?q?refactor:=20.devops/PR=E9=80=9A=E7=9F=A5.?= =?UTF-8?q?yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devops/PR通知.yml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/.devops/PR通知.yml b/.devops/PR通知.yml index 014c51e..3e76a5b 100644 --- a/.devops/PR通知.yml +++ b/.devops/PR通知.yml @@ -12,16 +12,20 @@ workflow: - ref: start name: 开始 task: start - - ref: shell_0 - name: shell - image: ubuntu:22.10 - script: - - echo "hello word" - needs: - - start - ref: end name: 结束 task: end needs: - - shell_0 + - dingtalk_notice_text_0 + - ref: dingtalk_notice_text_0 + name: 钉钉通知-文本 + task: dingtalk_notice_text@1.0.2 + input: + boot_webhook_url: ((dingdingtalk.token_url)) + secret: ((dingdingtalk.token_sercet)) + msg_text: '"有的PR提交，请审核"' + at_user_ids: '"[]"' + at_mobiles: '"[]"' + needs: + - start -- 2.34.1 From fbc244029744c27e329f3226163f2ed860ec61ec Mon Sep 17 00:00:00 2001 From: xxq250 Date: Thu, 16 Mar 2023 14:30:53 +0800 Subject: [PATCH 46/58] =?UTF-8?q?refactor:=20.devops/PR=E9=80=9A=E7=9F=A5.?= =?UTF-8?q?yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devops/PR通知.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.devops/PR通知.yml b/.devops/PR通知.yml index 3e76a5b..c171870 100644 --- a/.devops/PR通知.yml +++ b/.devops/PR通知.yml @@ -23,7 +23,9 @@ workflow: input: boot_webhook_url: ((dingdingtalk.token_url)) secret: ((dingdingtalk.token_sercet)) - msg_text: '"有的PR提交，请审核"' + msg_text: 【"+((trigger.user)) + + "】从"+((trigger.source_branch))+"提交PR到"+((trigger.target_branch)) + + "，请您立即确实是否合并。" at_user_ids: '"[]"' at_mobiles: '"[]"' needs: -- 2.34.1 From 879f322c01adddeaae55ed7d935e265cb64bde0c Mon Sep 17 00:00:00 2001 From: xxq250 Date: Thu, 16 Mar 2023 14:33:28 +0800 Subject: [PATCH 47/58] =?UTF-8?q?refactor:=20.devops/PR=E9=80=9A=E7=9F=A5.?= =?UTF-8?q?yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devops/PR通知.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.devops/PR通知.yml b/.devops/PR通知.yml index c171870..2ed0828 100644 --- a/.devops/PR通知.yml +++ b/.devops/PR通知.yml @@ -23,9 +23,9 @@ workflow: input: boot_webhook_url: ((dingdingtalk.token_url)) secret: ((dingdingtalk.token_sercet)) - msg_text: 【"+((trigger.user)) + + msg_text: '"【"+((trigger.user)) + "】从"+((trigger.source_branch))+"提交PR到"+((trigger.target_branch)) + - "，请您立即确实是否合并。" + "，请您立即确实是否合并。"' at_user_ids: '"[]"' at_mobiles: '"[]"' needs: -- 2.34.1 From fc4f1eb42678a75e6ec7c993515120cb8dfedcca Mon Sep 17 00:00:00 2001 From: xxq250 Date: Thu, 16 Mar 2023 14:38:51 +0800 Subject: [PATCH 48/58] =?UTF-8?q?refactor:=20.devops/PR=E9=80=9A=E7=9F=A5.?= =?UTF-8?q?yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devops/PR通知.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.devops/PR通知.yml b/.devops/PR通知.yml index 2ed0828..e299384 100644 --- a/.devops/PR通知.yml +++ b/.devops/PR通知.yml @@ -23,9 +23,9 @@ workflow: input: boot_webhook_url: ((dingdingtalk.token_url)) secret: ((dingdingtalk.token_sercet)) - msg_text: '"【"+((trigger.user)) + - "】从"+((trigger.source_branch))+"提交PR到"+((trigger.target_branch)) + - "，请您立即确实是否合并。"' + msg_text: "\"【\"+((trigger.user)) + + \"】从\"+((trigger.source_branch))+\"提交PR到\"+((trigger.target_branch)) + + \"，((trigger.action=='closed' ? \\\"已关闭\\\"：\\\"请您立即确认是否合并。\\\"))\"" at_user_ids: '"[]"' at_mobiles: '"[]"' needs: -- 2.34.1 From d027b5f3e3a91e9b1c9ab255cf44b8cf3c45203e Mon Sep 17 00:00:00 2001 From: xxq250 Date: Thu, 16 Mar 2023 14:40:24 +0800 Subject: [PATCH 49/58] =?UTF-8?q?refactor:=20.devops/PR=E9=80=9A=E7=9F=A5.?= =?UTF-8?q?yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devops/PR通知.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.devops/PR通知.yml b/.devops/PR通知.yml index e299384..4453745 100644 --- a/.devops/PR通知.yml +++ b/.devops/PR通知.yml @@ -23,9 +23,9 @@ workflow: input: boot_webhook_url: ((dingdingtalk.token_url)) secret: ((dingdingtalk.token_sercet)) - msg_text: "\"【\"+((trigger.user)) + - \"】从\"+((trigger.source_branch))+\"提交PR到\"+((trigger.target_branch)) + - \"，((trigger.action=='closed' ? \\\"已关闭\\\"：\\\"请您立即确认是否合并。\\\"))\"" + msg_text: '"【"+((trigger.user)) + + "】从"+((trigger.source_branch))+"提交PR到"+((trigger.target_branch)) + + "，请您立即确认是否合并。"' at_user_ids: '"[]"' at_mobiles: '"[]"' needs: -- 2.34.1 From 43b433d20a88830251465cad798ce00af175bafe Mon Sep 17 00:00:00 2001 From: xxq250 Date: Thu, 16 Mar 2023 14:41:08 +0800 Subject: [PATCH 50/58] =?UTF-8?q?refactor:=20.devops/PR=E9=80=9A=E7=9F=A5.?= =?UTF-8?q?yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devops/PR通知.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.devops/PR通知.yml b/.devops/PR通知.yml index 4453745..32b16c1 100644 --- a/.devops/PR通知.yml +++ b/.devops/PR通知.yml @@ -7,6 +7,10 @@ trigger: webhook: gitlink@1.0.0 event: - ref: pr + ruleset: + - param-ref: action + operator: EQ + value: "'opened'" ruleset-operator: AND workflow: - ref: start -- 2.34.1 From d7b1a4da56e90eaf271e7525ae48be3d0dfad34b Mon Sep 17 00:00:00 2001 From: xxq2504 Date: Thu, 16 Mar 2023 14:46:10 +0800 Subject: [PATCH 51/58] Add test.txt --- test.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 test.txt diff --git a/test.txt b/test.txt new file mode 100644 index 0000000..4d65e87 --- /dev/null +++ b/test.txt @@ -0,0 +1 @@ +测试devops提交pr \ No newline at end of file -- 2.34.1 From 46377c831cbaed1f5c75bf55b6aea48959a204cf Mon Sep 17 00:00:00 2001 From: xxq250 Date: Tue, 28 Mar 2023 09:33:35 +0800 Subject: [PATCH 52/58] Update 1.txt --- 1.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/1.txt b/1.txt index 45d7d22..baedde3 100644 --- a/1.txt +++ b/1.txt @@ -4,4 +4,6 @@ java jar 123 sdfasdf -sdf123123123123 \ No newline at end of file +sdf123123123123 + +test smee \ No newline at end of file -- 2.34.1 From 33d190af3e9064ade7b5633f4611f1b138607f73 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Thu, 29 Jun 2023 16:27:26 +0800 Subject: [PATCH 53/58] Update 1.txt --- 1.txt | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/1.txt b/1.txt index baedde3..b6409ec 100644 --- a/1.txt +++ b/1.txt @@ -1,9 +1,3 @@ -ci test -java jar -123123 -123 - -sdfasdf -sdf123123123123 - -test smee \ No newline at end of file +111-222 +asdfl +cssdf \ No newline at end of file -- 2.34.1 From 65d1c1b2f5c024c2516486dcbed4e0bcfb56998b Mon Sep 17 00:00:00 2001 From: xxq250 Date: Fri, 1 Sep 2023 09:29:25 +0800 Subject: [PATCH 54/58] Update test.txt --- test.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test.txt b/test.txt index 4d65e87..befd718 100644 --- a/test.txt +++ b/test.txt @@ -1 +1,3 @@ -测试devops提交pr \ No newline at end of file +测试devops提交pr + +啦111 \ No newline at end of file -- 2.34.1 From dee1ad44f944c08cff63512c24c7852b552cf731 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Fri, 1 Sep 2023 12:21:33 +0800 Subject: [PATCH 55/58] Update test.txt --- test.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test.txt b/test.txt index befd718..0888530 100644 --- a/test.txt +++ b/test.txt @@ -1,3 +1,5 @@ 测试devops提交pr -啦111 \ No newline at end of file +啦111 + +123123 \ No newline at end of file -- 2.34.1 From 6d9af13c029a99e59395aa41274357a158c23d26 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Fri, 1 Sep 2023 12:21:42 +0800 Subject: [PATCH 56/58] =?UTF-8?q?refactor:=20.devops/PR=E9=80=9A=E7=9F=A5.?= =?UTF-8?q?yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devops/PR通知.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.devops/PR通知.yml b/.devops/PR通知.yml index 32b16c1..294c0cc 100644 --- a/.devops/PR通知.yml +++ b/.devops/PR通知.yml @@ -2,15 +2,15 @@ version: 2 name: PR通知 description: 新的PR提交会有钉钉通知 global: - concurrent: false + concurrent: 1 trigger: webhook: gitlink@1.0.0 event: - - ref: pr + - ref: push ruleset: - - param-ref: action + - param-ref: branch operator: EQ - value: "'opened'" + value: '"master"' ruleset-operator: AND workflow: - ref: start -- 2.34.1 From a38dd73548fa2ae04cffcb63e2d0ac99e844fc74 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Fri, 1 Sep 2023 12:22:54 +0800 Subject: [PATCH 57/58] Update test.txt --- test.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test.txt b/test.txt index 0888530..b79f83c 100644 --- a/test.txt +++ b/test.txt @@ -2,4 +2,6 @@ 啦111 -123123 \ No newline at end of file +123123 + +12314 \ No newline at end of file -- 2.34.1 From 46a42edbc43d0f7348242b6d6966de99730acff9 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Mon, 4 Sep 2023 16:03:37 +0800 Subject: [PATCH 58/58] =?UTF-8?q?refactor:=20.devops/PR=E9=80=9A=E7=9F=A5.?= =?UTF-8?q?yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devops/PR通知.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.devops/PR通知.yml b/.devops/PR通知.yml index 294c0cc..f9511b6 100644 --- a/.devops/PR通知.yml +++ b/.devops/PR通知.yml @@ -6,11 +6,7 @@ global: trigger: webhook: gitlink@1.0.0 event: - - ref: push - ruleset: - - param-ref: branch - operator: EQ - value: '"master"' + - ref: pr ruleset-operator: AND workflow: - ref: start -- 2.34.1