From 368231c5c925aeef3439b009b7de7317f8f768e4 Mon Sep 17 00:00:00 2001
From: Zhao Zuohong <zhbaor@zhaozuohong.vip>
Date: Wed, 22 Nov 2023 11:10:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E4=BF=AE=E5=A4=8DCI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/pyinstaller-win-shawn.yml | 24 ++++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/pyinstaller-win-shawn.yml b/.github/workflows/pyinstaller-win-shawn.yml
index 74c9ce3e0..f9a17fd50 100644
--- a/.github/workflows/pyinstaller-win-shawn.yml
+++ b/.github/workflows/pyinstaller-win-shawn.yml
@@ -96,6 +96,7 @@ jobs:
       - name: cache mower
         uses: actions/cache/save@v3
         with:
+          enableCrossOsArchive: true
           key: mower-${{ github.sha }}
           path: mower/mower
 
@@ -122,29 +123,36 @@ jobs:
           python -m venv venv
           venv/bin/pip install -U xxhash backports.zoneinfo[tzdata]
 
-      - name: restore mower
-        uses: actions/cache/restore@v3
-        with:
-          key: mower-${{ github.sha }}
-          path: ./mower
-
       - name: restore frontend dist
         uses: actions/cache/restore@v3
         with:
           key: frontend-dist-${{ github.sha }}
-          path: ./mower/_internal/dist
+          path: ui/dist
 
       - name: restore docs
         uses: actions/cache/restore@v3
         with:
           key: docs-${{ github.sha }}
-          path: ./mower/_internal/dist/docs
+          path: _site
+
+      - name: restore mower
+        uses: actions/cache/restore@v3
+        with:
+          enableCrossOsArchive: true
+          key: mower-${{ github.sha }}
+          path: mower/mower
+
+      - name: merge files
+        run: |
+          mv ui/dist mower/mower/_internal/
+          mv _site mower/mower/_internal/dist/docs
 
       - name: calculate hash
         working-directory: mower
         run: ../venv/bin/python ../publish.py
 
       - name: create zip
+        working-directory: mower
         run: zip -r mower.zip mower
 
       - uses: actions/upload-artifact@v3