Update main.yml

.github/workflows/main.yml

@@ -4,77 +4,63 @@ on:
   push:
     branches:
       - master
+
   release:
     types:
       - published
+
   workflow_dispatch:
 
 env:
   TZ: Asia/Shanghai
 
 jobs:
-  # Job 1: 检查代码并缓存依赖
+  deploy:
-  check_and_cache:
     runs-on: ubuntu-latest
     steps:
-      # 检查分支
     - name: 检查分支
       uses: actions/checkout@v5
       with:
         ref: master
         token: ${{ secrets.GITHUB_TOKEN }}
 
-      # 缓存 npm 包
     - name: 缓存项目 npm 包
       id: cache-node-modules
       uses: actions/cache@v4
       with:
         path: node_modules
-          key: ${{ runner.os }}-nodeModules-${{ hashFiles('package-lock.json') }}
+        key: ${{ runner.os }}-nodeModules-${{ hashFiles('package-lock.json') }}-${{ hashFiles('package.json') }}
         restore-keys: |
           ${{ runner.os }}-nodeModules-
 
-  # Job 2: 安装依赖和清理构建
+    - name: 安装 Node
-  install_and_clean:
+      uses: actions/setup-node@v5
-    runs-on: ubuntu-latest
+      with:
-    needs: check_and_cache
+        node-version: "22.x"
-    steps:
+
-      # 安装 Node 及 Hexo
+    - name: 安装 Hexo
-      - name: 安装 Node 和 Hexo
+      run: |
-        run: |
+        npm install hexo-cli --global
-          echo "安装 Node.js 版本 22.x"
+
-          cd ..
+    - name: 安装依赖
-          npm install hexo-cli --global
+      if: steps.cache-node-modules.outputs.cache-hit != 'true'
-          npm install || echo "依赖安装失败"
+      run: |
+        npm install
 
-      # 清理文件树
     - name: 清理文件树
       run: |
         npm run clean
 
-  # Job 3: 生成静态文件
-  build:
-    runs-on: ubuntu-latest
-    needs: install_and_clean
-    steps:
-      # 生成静态文件并压缩
     - name: 生成静态文件并压缩
       run: |
         npm run build
 
-  # Job 4: 部署到 GitHub Pages
+    - name: 部署
-  deploy_to_github:
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
-      - name: 部署静态文件到 GitHub Pages
       run: |
-          echo "开始部署到 GitHub page"
         cd ./public
         git init
         git config user.name "${{ github.actor }}"
         git config user.email "${{ github.actor }}@users.noreply.github.com"
         git add .
-          git commit -m "${{ github.event.head_commit.message }} · [${{ github.sha }}] · $(date +"%Y-%m-%d %H:%M:%S")"
+        git commit -m "${{ github.event.head_commit.message }}··[$(date +"%Z %Y-%m-%d %A %H:%M:%S")]"
-          # 将静态文件推送到指定的 Pages 仓库和 gh-pages 分支
+        git push --force --quiet "https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@github.com/bishshi/pages.git" master:master
-          git push --force --quiet "https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@github.com/bishshi/pages.git" master