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