From 2ef844373e4ff075ae241a6b6639b566645dc647 Mon Sep 17 00:00:00 2001
From: Gabe Yuan <gabe@zq.com>
Date: Tue, 15 Aug 2023 11:20:03 +0800
Subject: [PATCH] fix workflow

---
 .github/workflows/release.yml | 63 ++++++++++++++++++++++-------------
 package.json                  |  1 -
 2 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a29a535..3742f42 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -7,36 +7,39 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: "18.9.0"
-          registry-url: "https://registry.npmjs.org"
+          node-version: "18.17.0"
+          cache: "yarn"
       - run: yarn install
       - run: yarn build
-  deploy:
+      - uses: actions/upload-artifact@v3
+        with:
+          name: build-artifacts
+          path: build
+  deploy-web:
     needs: build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
+      - uses: actions/checkout@v3
+      - uses: actions/download-artifact@v3
+        with:
+          name: build-artifacts
+          path: build
       - name: Deploy to GitHub Pages
         uses: JamesIves/github-pages-deploy-action@v4
         with:
           folder: build/web
-          branch: gh-pages
-  archive:
-    needs: build
-    runs-on: ubuntu-latest
+  create-release:
+    runs-on: ubuntu-22.04
+    outputs:
+      upload_url: ${{ steps.create-release.outputs.upload_url }}
     steps:
-      - id: release
-        run: echo "fileName=kiss-translator_${{ github.ref }}.zip" >> "$GITHUB_OUTPUT"
-      - name: Archive Release
-        id: archive_release
-        run: zip -r ${{ steps.release.fileName }} build
-      - name: Create Release
-        id: create_release
-        uses: actions/create-release@v1
+      - uses: actions/create-release@v1
+        id: create-release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -44,13 +47,27 @@ jobs:
           release_name: Release ${{ github.ref }}
           draft: false
           prerelease: false
-      - name: Upload Release Asset
-        id: upload-release-asset
-        uses: actions/upload-release-asset@v1
+  upload-release:
+    needs: [build, create-release]
+    strategy:
+      matrix:
+        client: ["chrome", "edge", "firefox", "userscript"]
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/download-artifact@v3
+        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 }}
         with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./${{ steps.release.fileName }}
-          asset_name: ${{ steps.release.fileName }}
+          upload_url: ${{ needs.create-release.outputs.upload_url }}
+          asset_path: ./build/${{ matrix.client }}.zip
+          asset_name: kiss-translator_${{ github.ref_name }}_${{ matrix.client }}.zip
           asset_content_type: application/zip
diff --git a/package.json b/package.json
index 2b01017..b9752fc 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,6 @@
     "build:userscript": "rm -rf build/userscript && mkdir build/userscript && cp build/web/kiss-translator.user.js build/userscript/kiss-translator.user.js",
     "build": "yarn build:chrome && yarn build:edge && yarn build:firefox && yarn build:web && yarn build:userscript",
     "deploy:web": "wrangler pages deploy ./build/web --project-name kiss-translator",
-    "zip": "zip -r edge.zip dist/edge/",
     "test": "react-app-rewired test",
     "eject": "react-scripts eject"
   },