ci/fix->workflow

Bloggios · May 21, 2024 · 1f65773 · 1f65773
1 parent 2e9396a
commit 1f65773
Showing 1 changed file with 11 additions and 31 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -29,31 +29,23 @@ jobs:
       - name: Build with Maven
         run: mvn clean install
 
-      - name: Cleaning Docker File
+      - name: Stopping Container
         uses: appleboy/ssh-action@master
         with:
           host: ${{ secrets.V4_HOST }}
           username: ${{ secrets.V4_USERNAME }}
-          password: ${{ secrets.V4_VPS_PRIVATE_KEY }}
+          key: ${{ secrets.V4_VPS_PRIVATE_KEY }}
           port: 22
           script: |
             cd /root/bloggios-deployment-docker-files
             git stash
             git pull origin main
+            set +e
+            docker-compose -f docker-compose-devsandbox.yml stop bloggios-cloud-gateway
+            docker rmi bloggios-cloud-gateway:1.0
+            set -e
 
-      - name: Cleaning File
-        uses: appleboy/ssh-action@master
-        with:
-          host: ${{ secrets.V4_HOST }}
-          username: ${{ secrets.V4_USERNAME }}
-          password: ${{ secrets.V4_VPS_PRIVATE_KEY }}
-          port: 22
-          script: |
-            cd /root/microservices/bloggios-cloud-gateway
-            git stash
-            git pull origin main
-
-      - name: Add Logback File
+      - name: Copying Logback
         uses: appleboy/ssh-action@master
         with:
           host: ${{ secrets.V4_HOST }}
@@ -64,21 +56,7 @@ jobs:
             rm /root/microservices/bloggios-cloud-gateway/src/main/resources/gateway-logback.xml
             cp /root/secrets/logback/gateway-logback.xml /root/microservices/bloggios-cloud-gateway/src/main/resources
 
-      - name: Stopping Container
-        uses: appleboy/ssh-action@master
-        with:
-          host: ${{ secrets.V4_HOST }}
-          username: ${{ secrets.V4_USERNAME }}
-          key: ${{ secrets.V4_VPS_PRIVATE_KEY }}
-          port: 22
-          script: |
-            cd /root/bloggios-deployment-docker-files
-            set +e
-            docker-compose -f docker-compose-devsandbox.yml stop bloggios-cloud-gateway
-            docker rmi -f bloggios-cloud-gateway:1.0
-            set -e
-
-      - name: Generating Docker Image
+      - name: Generating Docker Image for Bloggios
         uses: appleboy/ssh-action@master
         with:
           host: ${{ secrets.V4_HOST }}
@@ -87,6 +65,8 @@ jobs:
           port: 22
           script: |
             cd /root/microservices/bloggios-cloud-gateway
+            git stash
+            git pull origin main
             chmod +x mvnw
             ./mvnw clean package
 
@@ -101,7 +81,7 @@ jobs:
             cd /root/bloggios-deployment-docker-files
             docker-compose -f docker-compose-devsandbox.yml up -d bloggios-cloud-gateway
 
-      - name: Cleaning Targets
+      - name: Removing Targets
         uses: appleboy/ssh-action@master
         with:
           host: ${{ secrets.V4_HOST }}