Merge remote-tracking branch 'nyanpasu/main'

.github/ISSUE_TEMPLATE/bug_report.md

@@ -3,8 +3,7 @@ name: Bug report
 about: Create a report to help us improve
 title: "[BUG]"
 labels: bug
-assignees: ''
-
+assignees: ""
 ---
 
 **Describe the bug**
@@ -12,6 +11,7 @@ A clear and concise description of what the bug is.
 
 **To Reproduce**
 Steps to reproduce the behavior:
+
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
@@ -24,9 +24,10 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.
 
 **Information**
- - OS: [e.g. macOS]
- - Clash Verge Version: [e.g. 1.3.4]
- - Clash Core: [e.g. Clash or Clash Meta]
+
+- OS: [e.g. macOS]
+- Clash Verge Version: [e.g. 1.3.4]
+- Clash Core: [e.g. Clash or Clash Meta]
 
 **Additional context**
 Add any other context about the problem here.

.github/workflows/dev.yaml

@@ -1,11 +1,10 @@
-name: Alpha CI
+name: Dev Build
 
 on:
   workflow_dispatch:
-    inputs:
-      debug:
-        type: boolean
-        default: false
+  push:
+    branches:
+      - dev
 
 env:
   CARGO_INCREMENTAL: 0
@@ -14,9 +13,9 @@ env:
 jobs:
   release:
     strategy:
-      fail-fast: false
       matrix:
-        os: [windows-latest, ubuntu-20.04, macos-latest]
+        os: [windows-latest, ubuntu-latest, macos-latest]
+
     runs-on: ${{ matrix.os }}
     if: startsWith(github.repository, 'wonfen')
     steps:
@@ -34,15 +33,20 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v4
         with:
-          node-version: "16"
-          cache: "yarn"
+          node-version: "20"
+
+      - uses: pnpm/action-setup@v2
+        name: Install pnpm
+        with:
+          version: 8
+          run_install: false
 
       - name: Delete current release assets
         if: startsWith(matrix.os, 'ubuntu-')
         uses: mknejp/delete-release-assets@v1
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          tag: alpha
+          token: ${{ secrets.GH_TOKEN }}
+          tag: dev
           fail-if-no-assets: false
           fail-if-no-release: false
           assets: |
@@ -54,40 +58,41 @@ jobs:
             *.msi
             *.sig
             *.exe
+            *.json
 
-      - name: Install Dependencies (ubuntu only)
+      - name: Install Dependencies (Ubuntu Only)
         if: startsWith(matrix.os, 'ubuntu-')
         run: |
           sudo apt-get update
           sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf openssl
 
-      - name: Yarn install and check
+      - name: Pnpm install and check
         run: |
-          yarn install --network-timeout 1000000 --frozen-lockfile
-          yarn run check --force
+          pnpm i
+          pnpm check
 
       - name: Tauri build
         uses: tauri-apps/tauri-action@v0
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
           TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
           TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
         with:
-          tagName: alpha
-          releaseName: "Clash Verge Alpha"
-          releaseBody: "Alpha Version (include debug)"
+          tagName: dev
+          releaseName: "Clash Verge Dev"
+          releaseBody: "More new features are now supported."
           releaseDraft: false
           prerelease: true
-          includeDebug: ${{ github.event.inputs.debug }}
+          tauriScript: pnpm
+          args: -f default-meta
 
       - name: Portable Bundle
-        if: startsWith(matrix.os, 'windows-')
+        if: matrix.os == 'windows-latest'
         run: |
-          yarn build
-          yarn run portable
+          pnpm portable
         env:
-          TAG_NAME: alpha
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          TAG_NAME: dev
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
           TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
           TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
           VITE_WIN_PORTABLE: 1

.github/workflows/release.yml

@@ -1,10 +1,10 @@
-name: Release CI
+name: Release Build
 
 on:
   workflow_dispatch:
   push:
-    tags:
-      - v**
+    branches:
+      - main
 
 env:
   CARGO_INCREMENTAL: 0
@@ -42,19 +42,24 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v4
         with:
-          node-version: "16"
-          cache: "yarn"
+          node-version: "20"
 
-      - name: Install Dependencies (ubuntu only)
+      - uses: pnpm/action-setup@v2
+        name: Install pnpm
+        with:
+          version: 8
+          run_install: false
+
+      - name: Install Dependencies (Ubuntu Only)
         if: startsWith(matrix.os, 'ubuntu-')
         run: |
           sudo apt-get update
           sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf openssl
 
-      - name: Yarn install and check
+      - name: Pnpm install and check
         run: |
-          yarn install --network-timeout 1000000 --frozen-lockfile
-          yarn run check
+          pnpm i
+          pnpm check
 
       - name: Tauri build
         uses: tauri-apps/tauri-action@v0
@@ -62,7 +67,7 @@ jobs:
         # continue-on-error: true
         if: matrix.portable == false
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
           TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
           TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
         with:
@@ -70,17 +75,16 @@ jobs:
           releaseName: "Clash Verge v__VERSION__"
           releaseBody: "More new features are now supported."
           releaseDraft: false
-          prerelease: true
+          prerelease: false
+          tauriScript: pnpm
           args: -f default-meta
 
       - name: Portable Bundle
-        if: matrix.portable == true
+        if: matrix.os == 'windows-latest'
         run: |
-          yarn install --network-timeout 1000000 --frozen-lockfile
-          yarn build -f default-meta
-          yarn run portable
+          pnpm portable
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
           TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
           TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
           VITE_WIN_PORTABLE: 1
@@ -98,13 +102,18 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v4
         with:
-          node-version: "16"
-          cache: "yarn"
+          node-version: "20"
 
-      - name: Yarn install
-        run: yarn install --network-timeout 1000000 --frozen-lockfile
+      - uses: pnpm/action-setup@v2
+        name: Install pnpm
+        with:
+          version: 8
+          run_install: false
+
+      - name: Pnpm install
+        run: pnpm i
 
       - name: Release updater file
-        run: yarn run updater
+        run: pnpm updater
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}

.github/workflows/updater.yaml

@@ -0,0 +1,31 @@
+name: Updater CI
+
+on: workflow_dispatch
+
+jobs:
+  release-update:
+    runs-on: ubuntu-latest
+    if: |
+      startsWith(github.repository, 'keiko233')
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Install Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: "20"
+
+      - uses: pnpm/action-setup@v2
+        name: Install pnpm
+        with:
+          version: 8
+          run_install: false
+
+      - name: Pnpm install
+        run: pnpm i
+
+      - name: Release updater file
+        run: pnpm updater
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}