diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml index 19fa9ab350f393c320e58200c6d05e9ed547e668..2c7813a71cf1babe1c04ae69ac0f25427209b73c 100644 --- a/.github/workflows/alpha.yml +++ b/.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 }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7e4e39228c769e49f2c1f2ab2bfc3cf0b3f205d2..ed2cb8dd5eee91fc71c88dc3183be841ca2cfe71 100644 --- a/.github/workflows/ci.yml +++ b/.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 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8e31ca787b5ef416f59a3dc788853f983f5e7a2f..b3e0a71a92063e8a9cbb93fc3ce2abf3976f2bc6 100644 --- a/.github/workflows/test.yml +++ b/.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 diff --git a/scripts/check.mjs b/scripts/check.mjs index 7041a32f773320af95d451b7859b04ff18e11861..3661f823e744a8e3aa459d25fc2fb2f21c516d09 100644 --- a/scripts/check.mjs +++ b/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}`;