From a1802e09910b9a376e3d559ae997595debe96823 Mon Sep 17 00:00:00 2001
From: Pascal Martineau <pascal@lewebsimple.ca>
Date: Wed, 27 Aug 2025 14:12:56 -0400
Subject: [PATCH] chore: combine deploy scripts into one

---
 .gitea/workflows/deploy-nuxthub.yaml          | 24 -------------------
 .../workflows/{deploy-wp.yaml => deploy.yaml} | 18 ++++++++++++--
 2 files changed, 16 insertions(+), 26 deletions(-)
 delete mode 100644 .gitea/workflows/deploy-nuxthub.yaml
 rename .gitea/workflows/{deploy-wp.yaml => deploy.yaml} (59%)

diff --git a/.gitea/workflows/deploy-nuxthub.yaml b/.gitea/workflows/deploy-nuxthub.yaml
deleted file mode 100644
index a6ea1f5..0000000
--- a/.gitea/workflows/deploy-nuxthub.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: NuxtHub deployment
-run-name: ${{ gitea.actor }} deploying ${{ gitea.repository.name }}
-on: [push]
-
-env:
-  NUXT_PROJECT_PATH: wp-content/themes/ccat
-
-jobs:
-  deploy:
-    runs-on: ubuntu-websimple
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Install dependencies
-        working-directory: ${{ env.NUXT_PROJECT_PATH }}
-        run: pnpm install
-
-      - name: Build & Deploy to NuxtHub
-        working-directory: ${{ env.NUXT_PROJECT_PATH }}
-        env:
-          NUXT_HUB_PROJECT_KEY: ${{ vars.NUXT_HUB_PROJECT_KEY }}
-          NUXT_HUB_USER_TOKEN: ${{ secrets.NUXT_HUB_USER_TOKEN }}
-        run: pnpx nuxthub@latest deploy
diff --git a/.gitea/workflows/deploy-wp.yaml b/.gitea/workflows/deploy.yaml
similarity index 59%
rename from .gitea/workflows/deploy-wp.yaml
rename to .gitea/workflows/deploy.yaml
index dd320f9..37eb0a4 100644
--- a/.gitea/workflows/deploy-wp.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -1,7 +1,10 @@
-name: WordPress deployment
+name: Deploy WordPress and Nuxt
 run-name: ${{ gitea.actor }} deploying ${{ gitea.repository.name }}
 on: [push]
 
+env:
+  NUXT_PROJECT_PATH: wp-content/themes/ccat
+
 jobs:
   deploy:
     runs-on: ubuntu-websimple
@@ -15,7 +18,7 @@ jobs:
         run: |
           git clone https://$TEMPLATES_REPO_TOKEN@gitea.websimple.com/templates/wp-scripts.git /tmp/wp-scripts
 
-      - name: Run deployment script
+      - name: Deploy WordPress
         env:
           REMOTE_HOST: ${{ vars.REMOTE_HOST }}
           REMOTE_PORT: ${{ vars.REMOTE_PORT }}
@@ -23,3 +26,14 @@ jobs:
           REMOTE_PATH: ${{ vars.REMOTE_PATH }}
           SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
         run: /tmp/wp-scripts/wp-deploy.sh --skip-node
+
+      - name: Install Node.js dependencies
+        working-directory: ${{ env.NUXT_PROJECT_PATH }}
+        run: pnpm install
+
+      - name: Deploy to NuxtHub
+        working-directory: ${{ env.NUXT_PROJECT_PATH }}
+        env:
+          NUXT_HUB_PROJECT_KEY: ${{ vars.NUXT_HUB_PROJECT_KEY }}
+          NUXT_HUB_USER_TOKEN: ${{ secrets.NUXT_HUB_USER_TOKEN }}
+        run: pnpx nuxthub@latest deploy