Skip to content

Commit

Permalink
Remake desktop
Browse files Browse the repository at this point in the history
Optimize change proxy

Optimize network check

Fix fallback issues

Optimize lots of details
  • Loading branch information
chen08209 committed Dec 6, 2024
1 parent 4b32a09 commit f9ec490
Show file tree
Hide file tree
Showing 96 changed files with 5,841 additions and 2,353 deletions.
83 changes: 63 additions & 20 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,70 @@ on:
- 'v*'

jobs:
changelog:
runs-on: ubuntu-latest
steps:
- name: Checkout
if: ${{ !contains(github.ref, '+') }}
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Generate
if: ${{ !contains(github.ref, '+') }}
run: |
tags=($(git tag --merged $(git rev-parse HEAD) --sort=-creatordate))
preTag=$(grep -oP '^## \K.*' CHANGELOG.md | head -n 1)
currentTag=""
for ((i = 0; i <= ${#tags[@]}; i++)); do
if (( i < ${#tags[@]} )); then
tag=${tags[$i]}
else
tag=""
fi
if [ -n "$currentTag" ]; then
if [ "$(echo -e "$currentTag\n$preTag" | sort -V | head -n 1)" == "$currentTag" ]; then
break
fi
fi
if [ -n "$currentTag" ]; then
echo "## $currentTag" >> NEW_CHANGELOG.md
echo "" >> NEW_CHANGELOG.md
if [ -n "$tag" ]; then
git log --pretty=format:"%B" "$tag..$currentTag" | awk 'NF {print "- " $0} !NF {print ""}' >> NEW_CHANGELOG.md
else
git log --pretty=format:"%B" "$currentTag" | awk 'NF {print "- " $0} !NF {print ""}' >> NEW_CHANGELOG.md
fi
echo "" >> NEW_CHANGELOG.md
fi
currentTag=$tag
done
cat CHANGELOG.md >> NEW_CHANGELOG.md
cat NEW_CHANGELOG.md > CHANGELOG.md
- name: Commit
if: ${{ !contains(github.ref, '+') }}
run: |
git add CHANGELOG.md
if ! git diff --cached --quiet; then
echo "Commit pushing"
git config --local user.email "[email protected]"
git config --local user.name "chen08209"
git commit -m "Update changelog"
git push
if [ $? -eq 0 ]; then
echo "Push succeeded"
else
echo "Push failed"
exit 1
fi
fi
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

build:
needs: [ changelog ]
runs-on: ${{ matrix.os }}
strategy:
matrix:
Expand All @@ -27,25 +90,6 @@ jobs:
arch: arm64

steps:
- name: Setup Mingw64
if: startsWith(matrix.platform,'windows')
uses: msys2/setup-msys2@v2
with:
msystem: mingw64
install: mingw-w64-x86_64-gcc
update: true

- name: Set Mingw64 Env
if: startsWith(matrix.platform,'windows')
run: |
echo "${{ runner.temp }}\msys64\mingw64\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
- name: Check Matrix
run: |
echo "Running on ${{ matrix.os }}"
echo "Arch: ${{ runner.arch }}"
gcc --version
- name: Checkout
uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -103,7 +147,6 @@ jobs:
path: ./dist
overwrite: true


upload:
permissions: write-all
needs: [ build ]
Expand Down
66 changes: 0 additions & 66 deletions .github/workflows/change.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion core/Clash.Meta
32 changes: 32 additions & 0 deletions core/action.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
//go:build !cgo

package main

import (
"encoding/json"
)

func (action Action) Json() ([]byte, error) {
data, err := json.Marshal(action)
return data, err
}

func (action Action) callback(data interface{}) bool {
if conn == nil {
return false
}
sendAction := Action{
Id: action.Id,
Method: action.Method,
Data: data,
}
res, err := sendAction.Json()
if err != nil {
return false
}
_, err = conn.Write(append(res, []byte("\n")...))
if err != nil {
return false
}
return true
}
Loading

0 comments on commit f9ec490

Please sign in to comment.