From 650d6e8b41b417115df95f8d0c24496ecc8698ee Mon Sep 17 00:00:00 2001 From: Gabe Date: Wed, 23 Jul 2025 20:58:50 +0800 Subject: [PATCH] fix: workflows --- .github/workflows/release.yml | 8 ++------ package.json | 3 ++- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d138096..b634006 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,7 +18,7 @@ jobs: node-version: latest cache: "pnpm" - run: pnpm install - - run: pnpm build + - run: pnpm build+zip - uses: actions/upload-artifact@v4 with: name: build-artifacts @@ -55,7 +55,7 @@ jobs: needs: [build, create-release] strategy: matrix: - client: ["chrome", "edge", "firefox", "userscript"] + client: ["chrome", "edge", "firefox", "userscript", "thunderbird"] runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -63,10 +63,6 @@ jobs: with: name: build-artifacts path: build - - name: Zip Release - run: | - cd build - zip -r ${{ matrix.client }}.zip ${{ matrix.client }} - uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/package.json b/package.json index d9e450e..d700c80 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,8 @@ "build:userscript": "rm -rf build/userscript && mkdir build/userscript && cp build/web/*.user.js build/userscript/", "build:rules": "babel-node src/rules.js", "build": "pnpm format && pnpm build:chrome && pnpm build:edge && pnpm build:thunderbird && pnpm build:firefox && pnpm build:web && pnpm build:userscript-ios && pnpm build:userscript && pnpm build:rules", - "zip": "cd build && zip -r chrome.zip chrome && zip -r edge.zip edge && (cd firefox && zip -r ../firefox.zip .) && (cd thunderbird && zip -r ../thunderbird.zip .)", + "zip": "cd build && rm -f *.zip && zip -r chrome.zip chrome && zip -r edge.zip edge && (cd firefox && zip -r ../firefox.zip .) && (cd thunderbird && zip -r ../thunderbird.zip .)", + "build+zip": "pnpm build && pnpm zip", "format": "prettier --write \"**/*.{js,json,html}\"", "test": "react-app-rewired test", "eject": "react-scripts eject"