250722

Author: AdingApkgg

.github/workflows/hugo.yaml

@@ -1,20 +1,20 @@
 # Sample workflow for building and deploying a Hugo site to GitHub Pages
-name: Deploy Hugo site to Pages
+name: Deploy Hugo site to gh-pages branch
 
 on:
   # Runs on pushes targeting the default branch
   push:
     branches:
-      - dev
+      - dev # 或者您希望触发部署的分支，例如 main 或 master
 
   # 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
+# Sets permissions of the GITHUB_TOKEN to allow deployment
 permissions:
-  contents: read
-  pages: write
-  id-token: write
+  contents: write # 需要写入权限来推送分支
+  pages: write # 如果您仍然使用GitHub Pages服务（尽管是推送到gh-pages），保留此权限
+  id-token: write # 如果您使用OIDC，保留此权限
 
 # 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.
@@ -25,7 +25,6 @@ concurrency:
 # Default to bash
 defaults:
   run:
-    # GitHub-hosted runners automatically enable `set -eo pipefail` for Bash shells.
     shell: bash
 
 jobs:
@@ -53,9 +52,10 @@ jobs:
         with:
           submodules: recursive
           fetch-depth: 0
-      - name: Setup Pages
-        id: pages
-        uses: actions/configure-pages@v5
+      # 如果您不使用actions/configure-pages和actions/deploy-pages，则不需要此步骤
+      # - name: Setup Pages
+      #   id: pages
+      #   uses: actions/configure-pages@v5
       - name: Install Node.js dependencies
         run: "[[ -f package-lock.json || -f npm-shrinkwrap.json ]] && npm ci || true"
       - name: Cache Restore
@@ -70,10 +70,15 @@ jobs:
         run: git config core.quotepath false
       - name: Build with Hugo
         run: |
+          # 注意：如果您不使用actions/configure-pages，则baseURL可能需要硬编码或从其他地方获取
+          # 如果您的GitHub Pages URL是 username.github.io/repo-name/
+          # 则 baseURL 应该是 /repo-name/
+          # 如果是 username.github.io/
+          # 则 baseURL 应该是 /
           hugo \
             --gc \
             --minify \
-            --baseURL "${{ steps.pages.outputs.base_url }}/" \
+            --baseURL "/" \ # 根据您的实际情况修改此项
             --cacheDir "${{ runner.temp }}/hugo_cache"
       - name: Cache Save
         id: cache-save
@@ -82,19 +87,41 @@ jobs:
           path: |
             ${{ runner.temp }}/hugo_cache
           key: ${{ steps.cache-restore.outputs.cache-primary-key }}
-      - name: Upload artifact
-        uses: actions/upload-pages-artifact@v3
-        with:
-          path: ./public
+      # 移除 Upload artifact 步骤，因为我们将直接推送到分支
+      # - name: Upload artifact
+      #   uses: actions/upload-pages-artifact@v3
+      #   with:
+      #     path: ./public
 
   # Deployment job
   deploy:
     environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
+      name: github-pages # 仍然可以使用此环境，但实际部署方式不同
+      url: ${{ steps.deployment.outputs.page_url }} # 此URL将由peaceiris/actions-gh-pages提供
     runs-on: ubuntu-latest
-    needs: build
+    needs: build # 确保在构建完成后运行
     steps:
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v4
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          fetch-depth: 0 # 确保获取完整的历史记录以便推送
+
+      - name: Configure Git
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+
+      - name: Deploy to gh-pages branch
+        uses: peaceiris/actions-gh-pages@v3 # 使用此Action来推送
+        id: deployment # 为输出URL设置ID
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./public # 指定要发布到gh-pages分支的目录
+          publish_branch: gh-pages # 指定目标分支
+          user_name: "github-actions[bot]"
+          user_email: "github-actions[bot]@users.noreply.github.com"
+          # 如果您的站点是项目页面（例如 username.github.io/repo-name/），
+          # 并且您希望在gh-pages分支的根目录中包含子目录，请取消注释以下行
+          # cname: example.com # 如果您有自定义域名，可以在这里设置
+          # keep_files: true # 如果您想保留gh-pages分支上的现有文件

.gitignore

@@ -1,3 +1,4 @@
 .history/
+public/
 resources/
 .hugo_build.lock