From edc031be82641d04440b076049e092a96ca1e824 Mon Sep 17 00:00:00 2001
From: liyunze <50455574+liyunze-coding@users.noreply.github.com>
Date: Sat, 8 Feb 2025 19:28:08 +0800
Subject: [PATCH] testing new yml for Github Actions

---
 .github/workflows/deploy.yml | 48 --------------------------
 .github/workflows/web.yml    | 65 ++++++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 48 deletions(-)
 delete mode 100644 .github/workflows/deploy.yml
 create mode 100644 .github/workflows/web.yml

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
deleted file mode 100644
index d7b55c1..0000000
--- a/.github/workflows/deploy.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-# Simple workflow for deploying static content to GitHub Pages
-name: Deploy to GitHub Pages
-
-on:
-    # Runs on pushes targeting the default branch
-    push:
-        branches: ["main"]
-
-    # Allows you to run this workflow manually from the Actions tab
-    workflow_dispatch:
-
-# Sets the GITHUB_TOKEN permissions to allow deployment to GitHub Pages
-permissions:
-    contents: read
-    pages: write
-    id-token: write
-
-# Allow one concurrent deployment
-concurrency:
-    group: "pages"
-    cancel-in-progress: true
-
-jobs:
-    # Single deploy job since we're just deploying
-    deploy:
-        environment:
-            name: github-pages
-            url: ${{ steps.deployment.outputs.page_url }}
-        runs-on: ubuntu-latest
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v4
-            - name: Set up Bun
-              uses: oven-sh/setup-bun@v1
-            - name: Install dependencies
-              run: bun install
-            - name: Build
-              run: bun run build
-            - name: Setup Pages
-              uses: actions/configure-pages@v3
-            - name: Upload artifact
-              uses: actions/upload-pages-artifact@v1
-              with:
-                  # Upload dist repository
-                  path: "./dist"
-            - name: Deploy to GitHub Pages
-              id: deployment
-              uses: actions/deploy-pages@v1
diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml
new file mode 100644
index 0000000..46c5ac9
--- /dev/null
+++ b/.github/workflows/web.yml
@@ -0,0 +1,65 @@
+name: Deploy Astro site to Pages
+
+on:
+    # Runs on pushes targeting the default branch
+    push:
+        branches: [$default-branch]
+
+    # Allows you to run this workflow manually from the Actions tab
+    workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+    contents: read
+    pages: write
+    id-token: write
+
+# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+concurrency:
+    group: "pages"
+    cancel-in-progress: false
+
+env:
+    BUILD_PATH: "." # default value when not using subfolders
+    # BUILD_PATH: subfolder
+
+jobs:
+    build:
+        name: Build
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+            - name: Install Bun
+              uses: oven-sh/setup-bun@v1
+              with:
+                  bun-version: 1.2.2
+            - name: Setup Pages
+              id: pages
+              uses: actions/configure-pages@v5
+            - name: Install dependencies
+              run: bun install
+              working-directory: ${{ env.BUILD_PATH }}
+            - name: Build with Astro
+              run: |
+                  bun astro build \
+                    --site "${{ steps.pages.outputs.origin }}" \
+                    --base "${{ steps.pages.outputs.base_path }}"
+              working-directory: ${{ env.BUILD_PATH }}
+            - name: Upload artifact
+              uses: actions/upload-pages-artifact@v3
+              with:
+                  path: ${{ env.BUILD_PATH }}/dist
+
+    deploy:
+        environment:
+            name: github-pages
+            url: ${{ steps.deployment.outputs.page_url }}
+        needs: build
+        runs-on: ubuntu-latest
+        name: Deploy
+        steps:
+            - name: Deploy to GitHub Pages
+              id: deployment
+              uses: actions/deploy-pages@v4