Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
Clash Verge
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
many-archive
Clash Verge
Commits
936b2131
There was an error fetching the commit references. Please try again later.
Unverified
Commit
936b2131
authored
3 years ago
by
GyDi
Browse files
Options
Downloads
Patches
Plain Diff
chore: adjust ci and script
parent
aaef6a9e
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.github/workflows/alpha.yml
+4
-27
4 additions, 27 deletions
.github/workflows/alpha.yml
.github/workflows/ci.yml
+1
-1
1 addition, 1 deletion
.github/workflows/ci.yml
.github/workflows/test.yml
+1
-1
1 addition, 1 deletion
.github/workflows/test.yml
scripts/check.mjs
+2
-2
2 additions, 2 deletions
scripts/check.mjs
with
8 additions
and
31 deletions
.github/workflows/alpha.yml
+
4
−
27
View file @
936b2131
...
...
@@ -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 }}
This diff is collapsed.
Click to expand it.
.github/workflows/ci.yml
+
1
−
1
View file @
936b2131
...
...
@@ -73,7 +73,7 @@ jobs:
releaseDraft
:
false
prerelease
:
true
-
name
:
Green zip b
undle
-
name
:
Portable B
undle
if
:
matrix.os == 'windows-latest'
run
:
|
yarn run portable
...
...
This diff is collapsed.
Click to expand it.
.github/workflows/test.yml
+
1
−
1
View file @
936b2131
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
scripts/check.mjs
+
2
−
2
View file @
936b2131
...
...
@@ -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
}
`
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment