From 8bc3c4bbc4851e87ce9848ec053bb300fb9df066 Mon Sep 17 00:00:00 2001
From: M397749490 <397749490@qq.com>
Date: Fri, 29 Dec 2023 00:23:40 +0800
Subject: [PATCH] fix: workflow run order

---
 .github/workflows/deploy.yml       | 21 ---------------------
 .github/workflows/docker-image.yml | 19 +++++++++++++++----
 2 files changed, 15 insertions(+), 25 deletions(-)
 delete mode 100644 .github/workflows/deploy.yml

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
deleted file mode 100644
index 504eda0..0000000
--- a/.github/workflows/deploy.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: Deploy To Server
-
-on:
-  push: 
-    branches: [ "main" ]
-
-jobs:
-  deploy:
-    name: Deploy
-    runs-on: ubuntu-latest
-    steps:
-      - name: SSH To Host
-        uses: appleboy/ssh-action@v1.0.1
-        with:
-          host: ${{ secrets.SSH_HOST }}
-          username: ${{ secrets.SSH_USER }}
-          key: ${{ secrets.SSH_KEY }}
-          port: ${{ secrets.SSH_PORT }}
-          script: |
-            cd ${{ secrets.PROJ_PATH }}
-            sudo bash ./deploy.sh
\ No newline at end of file
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index f01591e..300bd70 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -11,19 +11,15 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
-
       - name: Login to DockerHub
         uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-
       - name: Build and push
         id: docker_build
         uses: docker/build-push-action@v4
@@ -35,3 +31,18 @@ jobs:
             ${{ secrets.DOCKERHUB_USERNAME }}/toyou-frontend:latest
           cache-from: type=gha
           cache-to: type=gha,mode=max
+  deploy:
+    name: Deploy
+    needs: build_docker
+    runs-on: ubuntu-latest
+    steps:
+      - name: SSH To Host
+        uses: appleboy/ssh-action@v1.0.1
+        with:
+          host: ${{ secrets.SSH_HOST }}
+          username: ${{ secrets.SSH_USER }}
+          key: ${{ secrets.SSH_KEY }}
+          port: ${{ secrets.SSH_PORT }}
+          script: |
+            cd ${{ secrets.PROJ_PATH }}
+            sudo bash ./deploy.sh
\ No newline at end of file