Compare commits

..

2 Commits

Author SHA1 Message Date
8c83d8d6e3 Change download links to avoid download error 2020-10-30 08:16:07 +08:00
b2c46ad31e Add blacklist mode 2020-10-30 08:13:52 +08:00
2 changed files with 13 additions and 17 deletions

View File

@ -17,7 +17,7 @@ jobs:
echo "RELEASE_NAME=Released on $(date +%Y%m%d%H%M)" >> $GITHUB_ENV echo "RELEASE_NAME=Released on $(date +%Y%m%d%H%M)" >> $GITHUB_ENV
echo "TAG_NAME=$(date +%Y%m%d%H%M)" >> $GITHUB_ENV echo "TAG_NAME=$(date +%Y%m%d%H%M)" >> $GITHUB_ENV
echo "custom_icloud=https://raw.githubusercontent.com/Loyalsoldier/domain-list-custom/release/icloud.txt" >> $GITHUB_ENV echo "custom_icloud=https://raw.githubusercontent.com/Loyalsoldier/domain-list-custom/release/icloud.txt" >> $GITHUB_ENV
echo "custom_tld_not_cn=https://raw.githubusercontent.com/Loyalsoldier/domain-list-custom/release/tld-!cn.txt" >> $GITHUB_ENV echo "custom_tld-not-cn=https://raw.githubusercontent.com/Loyalsoldier/domain-list-custom/release/tld-!cn.txt" >> $GITHUB_ENV
echo "Loyalsoldier_reject=https://raw.githubusercontent.com/Loyalsoldier/v2ray-rules-dat/release/reject-list.txt" >> $GITHUB_ENV echo "Loyalsoldier_reject=https://raw.githubusercontent.com/Loyalsoldier/v2ray-rules-dat/release/reject-list.txt" >> $GITHUB_ENV
echo "Loyalsoldier_proxy=https://raw.githubusercontent.com/Loyalsoldier/v2ray-rules-dat/release/proxy-list.txt" >> $GITHUB_ENV echo "Loyalsoldier_proxy=https://raw.githubusercontent.com/Loyalsoldier/v2ray-rules-dat/release/proxy-list.txt" >> $GITHUB_ENV
echo "Loyalsoldier_direct=https://raw.githubusercontent.com/Loyalsoldier/v2ray-rules-dat/release/direct-list.txt" >> $GITHUB_ENV echo "Loyalsoldier_direct=https://raw.githubusercontent.com/Loyalsoldier/v2ray-rules-dat/release/direct-list.txt" >> $GITHUB_ENV
@ -29,7 +29,7 @@ jobs:
shell: bash shell: bash
- name: Checkout the "hidden" branch - name: Checkout the "hidden" branch
uses: actions/checkout@v2.3.4 uses: actions/checkout@v2.3.3
with: with:
ref: hidden ref: hidden
@ -73,10 +73,10 @@ jobs:
echo "payload:" > greatfire.txt echo "payload:" > greatfire.txt
curl -sSL ${Loyalsoldier_greatfire} | perl -ne '/^([-_a-zA-Z0-9]+(\.[-_a-zA-Z0-9]+)*)/ && print " - |+.$1|\n"' | sed "s/|/'/g" >> greatfire.txt curl -sSL ${Loyalsoldier_greatfire} | perl -ne '/^([-_a-zA-Z0-9]+(\.[-_a-zA-Z0-9]+)*)/ && print " - |+.$1|\n"' | sed "s/|/'/g" >> greatfire.txt
- name: Generate tld-not-cn.txt file - name: Generate tld-!cn.txt file
run: | run: |
echo "payload:" > tld-not-cn.txt echo "payload:" > tld-!cn.txt
curl -sSL "${custom_tld_not_cn}" | perl -ne '/^domain:([-_a-zA-Z0-9]+(\.[-_a-zA-Z0-9]+)*)/ && print " - |+.$1|\n"' | sed "s/|/'/g" >> tld-not-cn.txt curl -sSL ${custom_tld-not-cn} | perl -ne '/^domain:([-_a-zA-Z0-9]+(\.[-_a-zA-Z0-9]+)*)/ && print " - |+.$1|\n"' | sed "s/|/'/g" >> tld-!cn.txt
- name: Generate cncidr.txt file - name: Generate cncidr.txt file
run: | run: |
@ -86,7 +86,7 @@ jobs:
- name: Move files to publish directory - name: Move files to publish directory
run: | run: |
mkdir -p publish mkdir -p publish
install -p {apple,icloud,google,proxy,direct,reject,gfw,greatfire,tld-not-cn,cncidr,lancidr}.txt ./publish/ install -p {apple,icloud,google,proxy,direct,reject,gfw,greatfire,cncidr,lancidr}.txt ./publish/
- name: Release and upload assets - name: Release and upload assets
uses: softprops/action-gh-release@v1 uses: softprops/action-gh-release@v1

View File

@ -44,9 +44,9 @@
- **GreatFire 域名列表 greatfire.txt** - **GreatFire 域名列表 greatfire.txt**
- [https://raw.githubusercontent.com/Loyalsoldier/clash-rules/release/greatfire.txt](https://raw.githubusercontent.com/Loyalsoldier/clash-rules/release/greatfire.txt) - [https://raw.githubusercontent.com/Loyalsoldier/clash-rules/release/greatfire.txt](https://raw.githubusercontent.com/Loyalsoldier/clash-rules/release/greatfire.txt)
- [https://cdn.jsdelivr.net/gh/Loyalsoldier/clash-rules@release/greatfire.txt](https://cdn.jsdelivr.net/gh/Loyalsoldier/clash-rules@release/greatfire.txt) - [https://cdn.jsdelivr.net/gh/Loyalsoldier/clash-rules@release/greatfire.txt](https://cdn.jsdelivr.net/gh/Loyalsoldier/clash-rules@release/greatfire.txt)
- **非中国大陆使用的顶级域名列表 tld-not-cn.txt** - **非中国大陆使用的顶级域名列表 tld-!cn.txt**
- [https://raw.githubusercontent.com/Loyalsoldier/clash-rules/release/tld-not-cn.txt](https://raw.githubusercontent.com/Loyalsoldier/clash-rules/release/tld-not-cn.txt) - [https://raw.githubusercontent.com/Loyalsoldier/clash-rules/release/tld-!cn.txt](https://raw.githubusercontent.com/Loyalsoldier/clash-rules/release/tld-!cn.txt)
- [https://cdn.jsdelivr.net/gh/Loyalsoldier/clash-rules@release/tld-not-cn.txt](https://cdn.jsdelivr.net/gh/Loyalsoldier/clash-rules@release/tld-not-cn.txt) - [https://cdn.jsdelivr.net/gh/Loyalsoldier/clash-rules@release/tld-!cn.txt](https://cdn.jsdelivr.net/gh/Loyalsoldier/clash-rules@release/tld-!cn.txt)
- **局域网 IP 及保留 IP 地址列表 lancidr.txt** - **局域网 IP 及保留 IP 地址列表 lancidr.txt**
- [https://raw.githubusercontent.com/Loyalsoldier/clash-rules/release/lancidr.txt](https://raw.githubusercontent.com/Loyalsoldier/clash-rules/release/lancidr.txt) - [https://raw.githubusercontent.com/Loyalsoldier/clash-rules/release/lancidr.txt](https://raw.githubusercontent.com/Loyalsoldier/clash-rules/release/lancidr.txt)
- [https://cdn.jsdelivr.net/gh/Loyalsoldier/clash-rules@release/lancidr.txt](https://cdn.jsdelivr.net/gh/Loyalsoldier/clash-rules@release/lancidr.txt) - [https://cdn.jsdelivr.net/gh/Loyalsoldier/clash-rules@release/lancidr.txt](https://cdn.jsdelivr.net/gh/Loyalsoldier/clash-rules@release/lancidr.txt)
@ -120,11 +120,11 @@ rule-providers:
path: ./ruleset/greatfire.yaml path: ./ruleset/greatfire.yaml
interval: 86400 interval: 86400
tld-not-cn: tld-!cn:
type: http type: http
behavior: domain behavior: domain
url: "https://cdn.jsdelivr.net/gh/Loyalsoldier/clash-rules@release/tld-not-cn.txt" url: "https://cdn.jsdelivr.net/gh/Loyalsoldier/clash-rules@release/tld-!cn.txt"
path: ./ruleset/tld-not-cn.yaml path: ./ruleset/tld-!cn.yaml
interval: 86400 interval: 86400
cncidr: cncidr:
@ -169,8 +169,6 @@ rules:
- PROCESS-NAME,NetTransport,DIRECT - PROCESS-NAME,NetTransport,DIRECT
- PROCESS-NAME,uTorrent,DIRECT - PROCESS-NAME,uTorrent,DIRECT
- PROCESS-NAME,WebTorrent,DIRECT - PROCESS-NAME,WebTorrent,DIRECT
- DOMAIN,clash.razord.top,DIRECT
- DOMAIN,yacd.haishan.me,DIRECT
- RULE-SET,reject,REJECT - RULE-SET,reject,REJECT
- RULE-SET,icloud,DIRECT - RULE-SET,icloud,DIRECT
- RULE-SET,apple,DIRECT - RULE-SET,apple,DIRECT
@ -207,10 +205,8 @@ rules:
- PROCESS-NAME,NetTransport,DIRECT - PROCESS-NAME,NetTransport,DIRECT
- PROCESS-NAME,uTorrent,DIRECT - PROCESS-NAME,uTorrent,DIRECT
- PROCESS-NAME,WebTorrent,DIRECT - PROCESS-NAME,WebTorrent,DIRECT
- DOMAIN,clash.razord.top,DIRECT
- DOMAIN,yacd.haishan.me,DIRECT
- RULE-SET,reject,REJECT - RULE-SET,reject,REJECT
- RULE-SET,tld-not-cn,PROXY - RULE-SET,tld-!cn,PROXY
- RULE-SET,gfw,PROXY - RULE-SET,gfw,PROXY
- RULE-SET,greatfire,PROXY - RULE-SET,greatfire,PROXY
- GEOIP,AE,PROXY - GEOIP,AE,PROXY