Update ci

VCbots · Jun 10, 2024 · b781d2d · b781d2d
1 parent 1dd8504
commit b781d2d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -4,6 +4,7 @@ on:
     push:
         branches: master
     workflow_dispatch:
+    workflow_call:
 
 jobs:
     build:
@@ -27,11 +28,13 @@ jobs:
           run: pip install -r requirements.txt
         - name: Build
           run: pyinstaller -F --hidden-import=PIL._tkinter_finder --additional-hooks-dir=hooks main.py -n vcbot-bili -i .res/icon.ico
+        - name: pack
+          run: 7z a -tzip build-${{runner.os}}.zip ./dist
         - name: Upload
           uses: actions/upload-artifact@v4
           with: 
             name: build-${{matrix.os}}
-            path: ./dist/*
+            path: ./build-${{runner.os}}.zip
     build-windows:
         if: false
         runs-on: windows-latest
@@ -45,8 +48,6 @@ jobs:
           run: pip install -r requirements.txt
         - name: Build
           run: pyinstaller  -F -w --hidden-import=PIL._tkinter_finder --additional-hooks-dir=hooks main.py -n vcbot-bili -i .res\icon.ico
-        - name: pack
-          run: 7z a -tzip build-${{runner.os}}.zip ./dist
         - name: Upload
           uses: actions/upload-artifact@v4
           with: 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,13 +1,15 @@
 name: Release
 
 on:
+    workflow_dispatch:
     push:
         tags: v*
 
 jobs:
     build:
         uses: ./.github/workflows/main.yml
     release:
+        needs: build
         runs-on: ubuntu-latest
         steps: 
             - name: download