purgatory/clash-verge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: adjust ci and script

Browse Source
This commit is contained in:
GyDi 2022-06-01 00:43:57 +08:00
parent aaef6a9e9c
commit 936b2131e0
No known key found for this signature in database
GPG Key ID: 1C95E0D3467B3084
4 changed files with 8 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
.github/workflows/alpha.yml vendored
View File

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

2
.github/workflows/ci.yml vendored
View File

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

2
.github/workflows/test.yml vendored
View File

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

4
scripts/check.mjs
View File

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