From b781d2dfd5daccedfbf402e151f90f6e80483326 Mon Sep 17 00:00:00 2001 From: luyanci <2058282593@qq.com> Date: Mon, 10 Jun 2024 17:31:16 +0800 Subject: [PATCH] Update ci --- .github/workflows/main.yml | 7 ++++--- .github/workflows/release.yml | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a90a7d5..5aa6dee 100644 --- 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 index 748b3ef..ff2a5c2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,6 +1,7 @@ name: Release on: + workflow_dispatch: push: tags: v* @@ -8,6 +9,7 @@ jobs: build: uses: ./.github/workflows/main.yml release: + needs: build runs-on: ubuntu-latest steps: - name: download