From 6e4de69fb4e262d5178ca48c8e864d3161e2528c Mon Sep 17 00:00:00 2001
From: wangwei <153692773@qq.com>
Date: Fri, 24 Feb 2023 09:51:22 +0800
Subject: [PATCH 1/5] update cron config in .drone.yml

---
 .drone.yml | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index f12168e..0a21b56 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -4,40 +4,38 @@ name: masterpipe
 platform:
   os: linux
   arch: arm64
-
 volumes:
-  - name: cache 
-    host:
-      path: /var/lib/cache
+- name: cache
+  host:
+    path: /var/lib/cache
 steps:
 - name: maven
   image: maven:3-jdk-10
   volumes:
-    - name: cache 
-      path: /root/.m2 
+  - name: cache
+    path: /root/.m2
   commands:
   - mvn compile
 - name: test
   image: maven:3-jdk-10
   volumes:
-    - name: cache 
-      path: /root/.m2 
+  - name: cache
+    path: /root/.m2
   commands:
   - mvn test
-
 - name: 远程主机部署
   image: appleboy/drone-ssh
   settings:
-    host: 
+    host:
       from_secret: ip
-    username: 
+    username:
       from_secret: name
-    password: 
+    password:
       from_secret: pwd
     port: 22
     script:
-      - chmod +x /home/deploy.sh
-      - ./home/deploy.sh
+    - chmod +x /home/deploy.sh
+    - ./home/deploy.sh
 trigger:
   branch:
   - master
-- 
2.25.1


From 292ab6b6a9de55716ef367a38e9bd3d207a18eae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E7=BA=A7=E4=BA=91=E8=84=91=E7=A0=94=E5=8F=91?=
 =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E5=B8=88?= <153692773@qq.com>
Date: Fri, 24 Feb 2023 09:54:37 +0800
Subject: [PATCH 2/5] update pipeline for ansible branch

---
 .drone.yml | 41 ++++++++++++-----------------------------
 1 file changed, 12 insertions(+), 29 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 0a21b56..b35f536 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,44 +1,27 @@
 kind: pipeline
 type: docker
-name: masterpipe
+name: 1
 platform:
   os: linux
   arch: arm64
-volumes:
-- name: cache
-  host:
-    path: /var/lib/cache
 steps:
 - name: maven
   image: maven:3-jdk-10
   volumes:
-  - name: cache
-    path: /root/.m2
+    - name: cache 
+      path: /root/.m2 
   commands:
   - mvn compile
-- name: test
-  image: maven:3-jdk-10
-  volumes:
-  - name: cache
-    path: /root/.m2
-  commands:
-  - mvn test
-- name: 远程主机部署
-  image: appleboy/drone-ssh
+
+- name: check ansible syntax
+  image: plugins/ansible:3
   settings:
-    host:
-      from_secret: ip
-    username:
-      from_secret: name
-    password:
-      from_secret: pwd
-    port: 22
-    script:
-    - chmod +x /home/deploy.sh
-    - ./home/deploy.sh
+    playbook: ansible/playbook.yml
+    galaxy: ansible/requirements.yml
+    inventory: ansible/inventory
+    syntax_check: true
 trigger:
   branch:
-  - master
+  - ansible
   event:
-  - push
-  - pull_request
+  - cron
-- 
2.25.1


From 382dd6f57ca0b6be2a275e10b33b0803c5792df6 Mon Sep 17 00:00:00 2001
From: wangwei10061 <153692771@qq.com>
Date: Fri, 24 Nov 2023 16:13:10 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'pom.xml'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ce4b6c6..16cec65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.educoder</groupId>
-    <artifactId>webssh</artifactId>
+    <artifactId>jwebssh</artifactId>
     <packaging>war</packaging>
     <version>1.0-SNAPSHOT</version>
     <name>webssh Maven Webapp</name>
-- 
2.25.1


From 06fca9d93dac5f77d5d803c5a7fe997d76f9dfc1 Mon Sep 17 00:00:00 2001
From: wangwei10061 <153692771@qq.com>
Date: Wed, 29 May 2024 14:41:57 +0800
Subject: [PATCH 4/5] update pipeline for ansible branch

---
 .drone.yml | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index b35f536..c756cf2 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -12,16 +12,20 @@ steps:
       path: /root/.m2 
   commands:
   - mvn compile
-
-- name: check ansible syntax
-  image: plugins/ansible:3
+- name: 远程主机部署
+  image: appleboy/drone-ssh:linux-arm64
   settings:
-    playbook: ansible/playbook.yml
-    galaxy: ansible/requirements.yml
-    inventory: ansible/inventory
-    syntax_check: true
+    host: 
+      from_secret: ip
+    username: 
+      from_secret: name
+    password: 
+      from_secret: pwd
+    port: 22
+    script:
+      - echo hello
 trigger:
   branch:
   - ansible
   event:
-  - cron
+  - push
-- 
2.25.1


From dfff3c66cc028cd0ef91d4d08eb01448a701e82a Mon Sep 17 00:00:00 2001
From: wangwei10061 <153692771@qq.com>
Date: Wed, 29 May 2024 14:46:49 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'test.txt'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test.txt b/test.txt
index 94ee7f5..d82cab5 100644
--- a/test.txt
+++ b/test.txt
@@ -1 +1 @@
-测试push
\ No newline at end of file
+测试push2
\ No newline at end of file
-- 
2.25.1