From c6e907e1365182339c2425b42ddc87ca47a30675 Mon Sep 17 00:00:00 2001
From: Andrew Wei <andrewscwei@gmail.com>
Date: Wed, 5 Jun 2024 22:48:45 -0700
Subject: [PATCH] ci: Fix CD script

---
 .github/workflows/cd.yml | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index ae59c0b..32b1192 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -20,6 +20,26 @@ jobs:
         uses: andrewscwei/actions/node-build@v1
         with:
           artifact-path: build/
+  deploy:
+    name: Deploy
+    needs: [build]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up Node
+        uses: actions/setup-node@v4
+        with:
+          cache: npm
+          node-version-file: .node-version
+      - name: Install Node modules
+        run: npm install
+      - name: Deploy to GitHub pages
+        uses: andrewscwei/actions/gh-pages-deploy@v1
+        with:
+          artifact-name: ${{ needs.build.outputs.artifact-name }}
+          artifact-path: ${{ needs.build.outputs.artifact-path }}
+          predeploy-command: npm run pages
   release:
     name: Release
     needs: [build]
@@ -38,10 +58,6 @@ jobs:
           node-version-file: .node-version
       - name: Install Node modules
         run: npm install
-      - name: Deploy to GitHub pages
-        uses: andrewscwei/actions/gh-pages-deploy@v1
-        with:
-          predeploy-command: npm run pages
       - name: Create release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -49,13 +65,13 @@ jobs:
         run: npx semantic-release
   notify:
     name: Notify
-    needs: [build, release]
+    needs: [build, deploy, release]
     if: ${{ always() }}
     runs-on: ubuntu-latest
     steps:
       - uses: andrewscwei/telegram-action@v1
         with:
-          success: ${{ needs.build.result == 'success' && needs.release.result == 'success' }}
-          cancelled: ${{ needs.build.result == 'cancelled' || needs.release.result == 'cancelled' }}
+          success: ${{ needs.build.result == 'success' && needs.deploy.result == 'success' && needs.release.result == 'success' }}
+          cancelled: ${{ needs.build.result == 'cancelled' || needs.deploy.result == 'cancelled' || needs.release.result == 'cancelled' }}
           bot-token: ${{ secrets.TELEGRAM_DEVOPS_BOT_TOKEN }}
           chat-id: ${{ secrets.TELEGRAM_DEVOPS_CHAT_ID }}