소스 검색

chore: adjust ci and script

GyDi 3 년 전
부모
커밋
936b2131e0
4개의 변경된 파일8개의 추가작업 그리고 31개의 파일을 삭제
  1. 4 27
      .github/workflows/alpha.yml
  2. 1 1
      .github/workflows/ci.yml
  3. 1 1
      .github/workflows/test.yml
  4. 2 2
      scripts/check.mjs

+ 4 - 27
.github/workflows/alpha.yml

@@ -58,31 +58,9 @@ jobs:
       - name: Yarn install and check
         run: |
           yarn install --network-timeout 1000000
-          yarn run check --meta
+          yarn run check
 
-      # - name: Tauri build
-      #   uses: tauri-apps/tauri-action@v0
-      #   # enable cache even though failed
-      #   continue-on-error: true
-      #   env:
-      #     GITHUB_TOKEN: ${{ secrets.GITHUB_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"
-      #     releaseDraft: false
-      #     prerelease: true
-
-      # - name: Green zip bundle
-      #   if: matrix.os == 'windows-latest'
-      #   run: |
-      #     yarn run portable
-      #   env:
-      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Tauri build Meta
+      - name: Tauri build
         uses: tauri-apps/tauri-action@743a37fd53cbdd122910b818b9bef7b7aa019134
         # enable cache even though failed
         continue-on-error: true
@@ -93,15 +71,14 @@ jobs:
           TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
         with:
           tagName: alpha
-          args: "-c src-tauri/tauri.alpha.json"
           releaseName: "Clash Verge Alpha"
           releaseBody: "Alpha Version"
           releaseDraft: true
           prerelease: true
 
-      - name: Portable Bundle For Meta
+      - name: Portable Bundle
         if: matrix.os == 'windows-latest'
         run: |
-          yarn run portable --meta
+          yarn run portable
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

+ 1 - 1
.github/workflows/ci.yml

@@ -73,7 +73,7 @@ jobs:
           releaseDraft: false
           prerelease: true
 
-      - name: Green zip bundle
+      - name: Portable Bundle
         if: matrix.os == 'windows-latest'
         run: |
           yarn run portable

+ 1 - 1
.github/workflows/test.yml

@@ -62,7 +62,7 @@ jobs:
       - name: Yarn install and check
         run: |
           yarn install --network-timeout 1000000
-          yarn run check --meta
+          yarn run check
 
       - name: Tauri build
         uses: tauri-apps/tauri-action@0e558392ccadcb49bcc89e7df15a400e8f0c954d

+ 2 - 2
scripts/check.mjs

@@ -10,7 +10,7 @@ const cwd = process.cwd();
 const TEMP_DIR = path.join(cwd, "node_modules/.verge");
 
 const FORCE = process.argv.includes("--force");
-const META = process.argv.includes("--meta"); // use Clash.Meta
+const NO_META = process.argv.includes("--no-meta") || false;
 
 /**
  * get the correct clash release infomation
@@ -87,7 +87,7 @@ async function resolveSidecar() {
   const ext = process.platform === "win32" ? ".exe" : "";
 
   await clash();
-  if (META) await clashMeta();
+  if (!NO_META) await clashMeta();
 
   async function clash() {
     const sidecarFile = `clash-${host}${ext}`;