From 36c86599f1529076690a8f127161b3bef4c04e98 Mon Sep 17 00:00:00 2001
From: CharlieJ107 <charlie_j107@outlook.com>
Date: Sun, 26 Jan 2025 06:42:37 +0000
Subject: [PATCH] Refactor publish workflow: remove content directory after
 copying and update Node.js version to 20

---
 .github/workflows/publish.yml | 28 +++-------------------------
 1 file changed, 3 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 5bb15fe..4488432 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -49,30 +49,13 @@ jobs:
         run: |
           cp -r content/content src/content/
           cp -r content/images src/images
+          rm -r content
           tree src
 
-      - name: Detect package manager
-        id: detect-package-manager
-        run: |
-          if [ -f "${{ github.workspace }}/yarn.lock" ]; then
-            echo "manager=yarn" >> $GITHUB_OUTPUT
-            echo "command=install" >> $GITHUB_OUTPUT
-            echo "runner=yarn" >> $GITHUB_OUTPUT
-            exit 0
-          elif [ -f "${{ github.workspace }}/package.json" ]; then
-            echo "manager=npm" >> $GITHUB_OUTPUT
-            echo "command=ci" >> $GITHUB_OUTPUT
-            echo "runner=npx --no-install" >> $GITHUB_OUTPUT
-            exit 0
-          else
-            echo "Unable to determine package manager"
-            exit 1
-          fi
-
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: "21"
+          node-version: "20"
 
       - name: Setup Pages
         id: pages
@@ -80,14 +63,9 @@ jobs:
 
       - name: Install dependencies
         run: ${{ steps.detect-package-manager.outputs.manager }} ${{ steps.detect-package-manager.outputs.command }}
-        working-directory: ${{ env.BUILD_PATH }}
 
       - name: Build with Astro
-        run: |
-          ${{ steps.detect-package-manager.outputs.runner }} astro build \
-            --site "${{ steps.pages.outputs.origin }}" \
-            --base "${{ steps.pages.outputs.base_path }}"
-        working-directory: ${{ env.BUILD_PATH }}
+        uses: withastro/action@v3
 
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v1