Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Misaka-blog committed Mar 9, 2024
1 parent a0db10e commit 22b9b87
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Run shadowrocket merge script
run: python merge.py
- name: Run sing-box script
run: python sb.py
run: python sing-box.py
- name: Commit Changes
run: |
if [[ -n "$(git status --porcelain)" ]]; then
Expand Down
20 changes: 14 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

套上warp可绕过chromego封锁的网站(P,X)

开启浏览器自带doh以及客户端tun模式也可绕过封锁,参考:[开启chrome自带doh](https://blog.mareep.net/posts/9993/)
开启浏览器自带doh以及客户端tun模式也可绕过封锁,参考:[开启chrome自带doh](https://blog.misaka.rest/2023/10/30/enable-doh-ech)

## 如何修改为自己的warp节点

Expand All @@ -17,11 +17,10 @@

[warp+机器人](https://t.me/generatewarpplusbot)

然后本地创建一个yaml文件,参考:[issues #20](https://github.com/mianayang/chromego_merge/issues/20)

</details>

## 订阅链接分享

### 不套warp版本(clashmeta)

```
Expand All @@ -46,24 +45,33 @@ https://mareep.netlify.app/sub/sb.json


## 客户端推荐

### Windows
- [clash verge](https://github.com/zzzgydi/clash-verge/releases)

- [clash verge](https://github.com/clash-verge-rev/clash-verge-rev)
- [nekoray](https://github.com/MatsuriDayo/nekoray)
### android

### Android

- [nekobox](https://github.com/MatsuriDayo/NekoBoxForAndroid)
- [clashmeta for android](https://github.com/MetaCubeX/ClashMetaForAndroid/releases)

### ios

- sing-box
- shadowrocket

### macos

- [clashx.meta](https://github.com/MetaCubeX/ClashX.Meta/releases)
- [clash verge](https://github.com/zzzgydi/clash-verge/releases)
- [clash verge](https://github.com/clash-verge-rev/clash-verge-rev)
- shadowrocket

## 致谢

- [Alvin9999](https://github.com/Alvin9999/pac2/tree/master)
- [sing-box-subscribe](https://github.com/Toperlock/sing-box-subscribe)

区域设置代码截取自:

- [chromegopacs](https://github.com/markbang/chromegopacs)

0 comments on commit 22b9b87

Please sign in to comment.