From 71e5175c73138b5d86a9cf5fa4669948dc70e2a2 Mon Sep 17 00:00:00 2001 From: Loyalsoldier <10487845+Loyalsoldier@users.noreply.github.com> Date: Wed, 3 Nov 2021 18:05:38 +0800 Subject: [PATCH] Feat: use CIDR from repo @Loyalsoldier/geoip --- .github/workflows/run.yml | 11 +++++++++-- README.md | 3 +++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index 2dc6189..a812ccd 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -27,7 +27,8 @@ jobs: echo "felixonmars_apple=https://raw.githubusercontent.com/felixonmars/dnsmasq-china-list/master/apple.china.conf" >> $GITHUB_ENV echo "felixonmars_google=https://raw.githubusercontent.com/felixonmars/dnsmasq-china-list/master/google.china.conf" >> $GITHUB_ENV echo "ipipnet_chinaiplist=https://raw.githubusercontent.com/17mon/china_ip_list/master/china_ip_list.txt" >> $GITHUB_ENV - echo "telegram_cidr=https://core.telegram.org/resources/cidr.txt" >> $GITHUB_ENV + echo "lan_cidr=https://raw.githubusercontent.com/Loyalsoldier/geoip/release/text/private.txt" >> $GITHUB_ENV + echo "telegram_cidr=https://raw.githubusercontent.com/Loyalsoldier/geoip/release/text/telegram.txt" >> $GITHUB_ENV shell: bash - name: Checkout the "hidden" branch @@ -95,12 +96,18 @@ jobs: - name: Generate telegramcidr.txt file run: | + echo "payload:" > telegramcidr.txt curl -sSL ${telegram_cidr} | perl -ne '/(.+\/\d+)/ && print " - |$1|\n"' | sed "s/|/'/g" >> telegramcidr.txt + - name: Generate lancidr.txt file + run: | + echo "payload:" > lancidr.txt + curl -sSL ${lan_cidr} | perl -ne '/(.+\/\d+)/ && print " - |$1|\n"' | sed "s/|/'/g" >> lancidr.txt + - name: Move files to publish directory run: | mkdir -p publish - install -p {apple,icloud,google,proxy,direct,reject,private,gfw,greatfire,tld-not-cn,cncidr,lancidr,telegramcidr}.txt ./publish/ + cp *.txt ./publish/ - name: Release and upload assets uses: softprops/action-gh-release@v0.1.6 diff --git a/README.md b/README.md index 6735462..53c29e0 100644 --- a/README.md +++ b/README.md @@ -226,6 +226,8 @@ rules: - RULE-SET,google,DIRECT - RULE-SET,proxy,PROXY - RULE-SET,direct,DIRECT + - RULE-SET,lancidr,DIRECT + - RULE-SET,cncidr,DIRECT - RULE-SET,telegramcidr,PROXY - GEOIP,,DIRECT - GEOIP,CN,DIRECT @@ -301,6 +303,7 @@ rules: ## 致谢 +- [@Loyalsoldier/geoip](https://github.com/Loyalsoldier/geoip) - [@Loyalsoldier/v2ray-rules-dat](https://github.com/Loyalsoldier/v2ray-rules-dat) - [@Loyalsoldier/cn-blocked-domain](https://github.com/Loyalsoldier/cn-blocked-domain) - [@gfwlist/gfwlist](https://github.com/gfwlist/gfwlist)