Compare commits
8 Commits
2020080423
...
2020102704
Author | SHA1 | Date | |
---|---|---|---|
5e7956ebe4 | |||
12b0214a27 | |||
92d01ffcba | |||
9607b36305 | |||
7ee290b55f | |||
636c38ac37 | |||
6f1a37e9c8 | |||
a94175521f |
22
.github/workflows/build.yml
vendored
22
.github/workflows/build.yml
vendored
@ -14,20 +14,20 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- name: Set variables
|
- name: Set variables
|
||||||
run: |
|
run: |
|
||||||
echo "::set-env name=RELEASE_NAME::Released on $(date +%Y%m%d%H%M)"
|
echo "RELEASE_NAME=Released on $(date +%Y%m%d%H%M)" >> $GITHUB_ENV
|
||||||
echo "::set-env name=TAG_NAME::$(date +%Y%m%d%H%M)"
|
echo "TAG_NAME=$(date +%Y%m%d%H%M)" >> $GITHUB_ENV
|
||||||
echo "::set-env name=v2fly_icloud::https://raw.githubusercontent.com/v2fly/domain-list-community/release/icloud.txt"
|
echo "v2fly_icloud=https://raw.githubusercontent.com/v2fly/domain-list-community/release/icloud.txt" >> $GITHUB_ENV
|
||||||
echo "::set-env name=v2fly_apple::https://raw.githubusercontent.com/v2fly/domain-list-community/release/apple.txt"
|
echo "v2fly_apple=https://raw.githubusercontent.com/v2fly/domain-list-community/release/apple.txt" >> $GITHUB_ENV
|
||||||
echo "::set-env name=Loyalsoldier_reject::https://raw.githubusercontent.com/Loyalsoldier/v2ray-rules-dat/release/reject-list.txt"
|
echo "Loyalsoldier_reject=https://raw.githubusercontent.com/Loyalsoldier/v2ray-rules-dat/release/reject-list.txt" >> $GITHUB_ENV
|
||||||
echo "::set-env name=Loyalsoldier_proxy::https://raw.githubusercontent.com/Loyalsoldier/v2ray-rules-dat/release/proxy-list.txt"
|
echo "Loyalsoldier_proxy=https://raw.githubusercontent.com/Loyalsoldier/v2ray-rules-dat/release/proxy-list.txt" >> $GITHUB_ENV
|
||||||
echo "::set-env name=Loyalsoldier_direct::https://raw.githubusercontent.com/Loyalsoldier/v2ray-rules-dat/release/direct-list.txt"
|
echo "Loyalsoldier_direct=https://raw.githubusercontent.com/Loyalsoldier/v2ray-rules-dat/release/direct-list.txt" >> $GITHUB_ENV
|
||||||
echo "::set-env name=felixonmars_apple::https://raw.githubusercontent.com/felixonmars/dnsmasq-china-list/master/apple.china.conf"
|
echo "felixonmars_apple=https://raw.githubusercontent.com/felixonmars/dnsmasq-china-list/master/apple.china.conf" >> $GITHUB_ENV
|
||||||
echo "::set-env name=felixonmars_google::https://raw.githubusercontent.com/felixonmars/dnsmasq-china-list/master/google.china.conf"
|
echo "felixonmars_google=https://raw.githubusercontent.com/felixonmars/dnsmasq-china-list/master/google.china.conf" >> $GITHUB_ENV
|
||||||
echo "::set-env name=ipipnet_chinaiplist::https://raw.githubusercontent.com/17mon/china_ip_list/master/china_ip_list.txt"
|
echo "ipipnet_chinaiplist=https://raw.githubusercontent.com/17mon/china_ip_list/master/china_ip_list.txt" >> $GITHUB_ENV
|
||||||
shell: bash
|
shell: bash
|
||||||
|
|
||||||
- name: Checkout the "hidden" branch
|
- name: Checkout the "hidden" branch
|
||||||
uses: actions/checkout@v2.3.1
|
uses: actions/checkout@v2.3.3
|
||||||
with:
|
with:
|
||||||
ref: hidden
|
ref: hidden
|
||||||
|
|
||||||
|
34
.github/workflows/run.yml
vendored
Normal file
34
.github/workflows/run.yml
vendored
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
# This is a basic workflow to help you get started with Actions
|
||||||
|
|
||||||
|
name: CI
|
||||||
|
|
||||||
|
# Controls when the action will run. Triggers the workflow on push or pull request
|
||||||
|
# events but only for the master branch
|
||||||
|
on:
|
||||||
|
workflow_dispatch:
|
||||||
|
push:
|
||||||
|
branches: [ master ]
|
||||||
|
pull_request:
|
||||||
|
branches: [ master ]
|
||||||
|
|
||||||
|
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
|
||||||
|
jobs:
|
||||||
|
# This workflow contains a single job called "build"
|
||||||
|
build:
|
||||||
|
# The type of runner that the job will run on
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
# Steps represent a sequence of tasks that will be executed as part of the job
|
||||||
|
steps:
|
||||||
|
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
|
||||||
|
- uses: actions/checkout@v2
|
||||||
|
|
||||||
|
# Runs a single command using the runners shell
|
||||||
|
- name: Run a one-line script
|
||||||
|
run: echo Hello, world!
|
||||||
|
|
||||||
|
# Runs a set of commands using the runners shell
|
||||||
|
- name: Run a multi-line script
|
||||||
|
run: |
|
||||||
|
echo Add other actions to build,
|
||||||
|
echo test, and deploy your project.
|
@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
## 说明
|
## 说明
|
||||||
|
|
||||||
本项目的规则集(RULE-SET)主要来源于项目 [@Loyalsoldier/v2ray-rules-dat](https://github.com/Loyalsoldier/v2ray-rules-dat);[`Apple`](https://github.com/Loyalsoldier/clash-rules/blob/release/apple.txt) 和 [`Google`](https://github.com/Loyalsoldier/clash-rules/blob/release/google.txt) 列表里的部分域名来源于项目 [@felixonmars/dnsmasq-china-list](https://github.com/felixonmars/dnsmasq-china-list);中国大陆 IPv4 地址数据使用 [@17mon/china_ip_list](https://github.com/17mon/china_ip_list)。
|
本项目的规则集(RULE-SET)主要来源于项目 [@Loyalsoldier/v2ray-rules-dat](https://github.com/Loyalsoldier/v2ray-rules-dat) 和 [@v2fly/domain-list-community](https://github.com/v2fly/domain-list-community);[`Apple`](https://github.com/Loyalsoldier/clash-rules/blob/release/apple.txt) 和 [`Google`](https://github.com/Loyalsoldier/clash-rules/blob/release/google.txt) 列表里的部分域名来源于项目 [@felixonmars/dnsmasq-china-list](https://github.com/felixonmars/dnsmasq-china-list);中国大陆 IPv4 地址数据使用 [@17mon/china_ip_list](https://github.com/17mon/china_ip_list)。
|
||||||
|
|
||||||
本项目的规则集(RULE-SET)只适用于 Clash **Premium** 版本。Clash Premium 相对于普通版,增加了 **TUN 增强模式**,能接管设备所有 TCP 和 UDP 流量,类似 [Surge for Mac](https://nssurge.com) 的增强模式。更多高级特性请看[官方 wiki](https://github.com/Dreamacro/clash/wiki/premium-core-features)。
|
本项目的规则集(RULE-SET)只适用于 Clash **Premium** 版本。Clash Premium 相对于普通版,增加了 **TUN 增强模式**,能接管设备所有 TCP 和 UDP 流量,类似 [Surge for Mac](https://nssurge.com) 的增强模式。更多高级特性请看[官方 wiki](https://github.com/Dreamacro/clash/wiki/premium-core-features)。
|
||||||
|
|
||||||
@ -115,13 +115,14 @@ rule-providers:
|
|||||||
#### Rules 配置方式
|
#### Rules 配置方式
|
||||||
|
|
||||||
- 以下配置中的 `PROCESS-NAME` 规则类型**只能**在 **ClashX Pro** 中使用,其余版本均不能使用,需要手动删除。
|
- 以下配置中的 `PROCESS-NAME` 规则类型**只能**在 **ClashX Pro** 中使用,其余版本均不能使用,需要手动删除。
|
||||||
- 如果希望使用 DNS 来解析未命中 RULE-SET 中域名类型规则的域名,而不是直接走代理,请删除 `cncidr` 行尾的 `,no-resolve`。
|
- 如果希望使用 DNS 来解析未命中域名类型规则的域名,而不是直接走代理,请删除 `cncidr` 行尾的 `,no-resolve`。
|
||||||
- 以下配置中,除了 `DIRECT` 和 `REJECT` 是默认存在于 Clash 中的 policy(路由策略/流量处理策略),其余均为自定义 policy,对应配置文件中 `proxies` 或 `proxy-groups` 中的 `name`。如你直接使用下面的 `rules` 规则,则需要在 `proxies` 或 `proxy-groups` 中手动配置一个 `name` 为 `PROXY` 的 policy。
|
- 以下配置中,除了 `DIRECT` 和 `REJECT` 是默认存在于 Clash 中的 policy(路由策略/流量处理策略),其余均为自定义 policy,对应配置文件中 `proxies` 或 `proxy-groups` 中的 `name`。如你直接使用下面的 `rules` 规则,则需要在 `proxies` 或 `proxy-groups` 中手动配置一个 `name` 为 `PROXY` 的 policy。
|
||||||
- 如你希望 Apple、iCloud 和 Google 列表中的域名使用代理,则把 policy 由 `DIRECT` 改为 `PROXY`,以此类推,举一反三。
|
- 如你希望 Apple、iCloud 和 Google 列表中的域名使用代理,则把 policy 由 `DIRECT` 改为 `PROXY`,以此类推,举一反三。
|
||||||
|
|
||||||
```yaml
|
```yaml
|
||||||
rules:
|
rules:
|
||||||
- PROCESS-NAME,v2ray,DIRECT
|
- PROCESS-NAME,v2ray,DIRECT
|
||||||
|
- PROCESS-NAME,Surge%203,DIRECT
|
||||||
- PROCESS-NAME,ss-local,DIRECT
|
- PROCESS-NAME,ss-local,DIRECT
|
||||||
- PROCESS-NAME,privoxy,DIRECT
|
- PROCESS-NAME,privoxy,DIRECT
|
||||||
- PROCESS-NAME,trojan,DIRECT
|
- PROCESS-NAME,trojan,DIRECT
|
||||||
@ -129,7 +130,7 @@ rules:
|
|||||||
- PROCESS-NAME,naive,DIRECT
|
- PROCESS-NAME,naive,DIRECT
|
||||||
- PROCESS-NAME,Thunder,DIRECT
|
- PROCESS-NAME,Thunder,DIRECT
|
||||||
- PROCESS-NAME,DownloadService,DIRECT
|
- PROCESS-NAME,DownloadService,DIRECT
|
||||||
- PROCESS-NAME,qbittorrent,DIRECT
|
- PROCESS-NAME,qBittorrent,DIRECT
|
||||||
- PROCESS-NAME,Transmission,DIRECT
|
- PROCESS-NAME,Transmission,DIRECT
|
||||||
- PROCESS-NAME,fdm,DIRECT
|
- PROCESS-NAME,fdm,DIRECT
|
||||||
- PROCESS-NAME,aria2c,DIRECT
|
- PROCESS-NAME,aria2c,DIRECT
|
||||||
@ -145,7 +146,6 @@ rules:
|
|||||||
- RULE-SET,direct,DIRECT
|
- RULE-SET,direct,DIRECT
|
||||||
- RULE-SET,lancidr,DIRECT,no-resolve
|
- RULE-SET,lancidr,DIRECT,no-resolve
|
||||||
- RULE-SET,cncidr,DIRECT,no-resolve
|
- RULE-SET,cncidr,DIRECT,no-resolve
|
||||||
- GEOIP,CN,DIRECT
|
|
||||||
- MATCH,PROXY
|
- MATCH,PROXY
|
||||||
```
|
```
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user