From a606ecd6aec223be93dc9b1b4bbca971689ec41c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=90=E6=AE=87?= <95160953+xishang0128@users.noreply.github.com> Date: Wed, 12 Apr 2023 15:45:23 +0800 Subject: [PATCH 1/5] Update run.yml --- .github/workflows/run.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index 5246075484..eafa28717f 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -183,7 +183,7 @@ jobs: NO_SKIP: true SED: grep DOMAIN | grep -v "#" | sed 's/ - DOMAIN,/full:/g' | sed 's/ - DOMAIN-SUFFIX,//g' | sed 's/ - DOMAIN-KEYWORD,/keyword:/g' run: | - cd community || exit 1 + cd custom || exit 1 mkdir -p data-lite curl -sSL https://raw.githubusercontent.com/xishang0128/rules/main/biliintl.list > ./data-lite/biliintl curl -sSL https://github.com/v2fly/domain-list-community/raw/master/data/ehentai > ./data-lite/ehentai @@ -221,6 +221,8 @@ jobs: echo include:google >> ./data-lite/proxy && echo include:github >> ./data-lite/proxy && echo include:netflix >> ./data-lite/proxy echo ipleak.net >> ./data-lite/proxy && echo browserleaks.org >> ./data-lite/proxy + + sed -i 's/data\"/data-list\"/g' main.go && sed -i 's/geosite.dat/geosite-lite.dat/g' main.go go run ./ --datapath=./data-lite --outputname geosite-lite.dat - name: Get geoip.dat relative files From 690e33d9d47246bcaddc74936c84b328b8b85747 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=90=E6=AE=87?= <95160953+xishang0128@users.noreply.github.com> Date: Wed, 12 Apr 2023 15:50:48 +0800 Subject: [PATCH 2/5] Update run.yml --- .github/workflows/run.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index eafa28717f..9d96000cbe 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -223,7 +223,7 @@ jobs: sed -i 's/data\"/data-list\"/g' main.go && sed -i 's/geosite.dat/geosite-lite.dat/g' main.go - go run ./ --datapath=./data-lite --outputname geosite-lite.dat + go run ./ --datapath=./data-lite - name: Get geoip.dat relative files run: | @@ -239,7 +239,7 @@ jobs: wget https://github.com/xishang0128/meta-rules-dat/releases/download/v2box/v2box chmod 755 v2box ./v2box migrate geosite -i ../custom/publish/geosite.dat -o ./geosite.db - ./v2box migrate geosite -i ../community/geosite-lite.dat -o ./geosite-lite.db + ./v2box migrate geosite -i ../custom/publish//geosite-lite.dat -o ./geosite-lite.db ./v2box migrate geoip -i ../geoip.dat -o ./geoip.db ./v2box migrate geoip -i ../geoip-lite.dat -o ./geoip-lite.db @@ -251,7 +251,7 @@ jobs: install -Dp ./geoip-lite.dat ./publish/ install -Dp ./geoip.dat ./publish/ install -Dp ./custom/publish/geosite.dat ./publish/ - install -Dp ./community/geosite-lite.dat ./publish/ + install -Dp ./custom/publish/geosite-lite.dat ./publish/ install -Dp ./v2box/geosite.db ./publish/ install -Dp ./v2box/geosite-lite.db ./publish/ From b07f558d6f6354c08c069ffc6b64a6fcf4c4457c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=90=E6=AE=87?= <95160953+xishang0128@users.noreply.github.com> Date: Wed, 12 Apr 2023 15:55:17 +0800 Subject: [PATCH 3/5] Update run.yml --- .github/workflows/run.yml | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index 9d96000cbe..47613b4141 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -183,47 +183,34 @@ jobs: NO_SKIP: true SED: grep DOMAIN | grep -v "#" | sed 's/ - DOMAIN,/full:/g' | sed 's/ - DOMAIN-SUFFIX,//g' | sed 's/ - DOMAIN-KEYWORD,/keyword:/g' run: | - cd custom || exit 1 + cd community || exit 1 mkdir -p data-lite curl -sSL https://raw.githubusercontent.com/xishang0128/rules/main/biliintl.list > ./data-lite/biliintl curl -sSL https://github.com/v2fly/domain-list-community/raw/master/data/ehentai > ./data-lite/ehentai - curl -sSL https://github.com/blackmatrix7/ios_rule_script/raw/master/rule/Clash/AbemaTV/AbemaTV.yaml | ${{ env.SED }} > ./data-lite/abema curl -sSL https://github.com/blackmatrix7/ios_rule_script/raw/master/rule/Clash/Apple/Apple_Classical.yaml | ${{ env.SED }} > ./data-lite/apple curl -sSL https://github.com/blackmatrix7/ios_rule_script/raw/master/rule/Clash/AppleMusic/AppleMusic.yaml | ${{ env.SED }} > ./data-lite/applemusic - curl -sSL https://github.com/blackmatrix7/ios_rule_script/raw/master/rule/Clash/BiliBili/BiliBili.yaml | ${{ env.SED }} > ./data-lite/bilibili curl -sSL https://github.com/blackmatrix7/ios_rule_script/raw/master/rule/Clash/Bahamut/Bahamut.yaml | ${{ env.SED }} > ./data-lite/bahamut curl https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/rule/Clash/China/China_Domain.yaml | grep - | sed "s/ - '+.//g" | sed "s/ - '/full:/g" | grep -v "#" | sed "s/'//g" > ./data-lite/cn - curl -sSL https://github.com/blackmatrix7/ios_rule_script/raw/master/rule/Clash/Google/Google.yaml | ${{ env.SED }} > ./data-lite/google curl -sSL https://github.com/blackmatrix7/ios_rule_script/raw/master/rule/Clash/GitHub/GitHub.yaml | ${{ env.SED }} > ./data-lite/github - curl -sSL https://github.com/blackmatrix7/ios_rule_script/raw/master/rule/Clash/Microsoft/Microsoft.yaml | ${{ env.SED }} > ./data-lite/microsoft - curl -sSL https://github.com/blackmatrix7/ios_rule_script/raw/master/rule/Clash/Netflix/Netflix.yaml | ${{ env.SED }} > ./data-lite/netflix - curl -sSL https://github.com/blackmatrix7/ios_rule_script/raw/master/rule/Clash/OpenAI/OpenAI.yaml | ${{ env.SED }} > ./data-lite/openai curl -sSL https://github.com/blackmatrix7/ios_rule_script/raw/master/rule/Clash/OneDrive/OneDrive.yaml | ${{ env.SED }} > ./data-lite/onedrive - curl -sSL https://github.com/blackmatrix7/ios_rule_script/raw/master/rule/Clash/Pixiv/Pixiv.yaml | ${{ env.SED }} > ./data-lite/pixiv curl -sSL https://github.com/blackmatrix7/ios_rule_script/raw/master/rule/Clash/ProxyLite/ProxyLite.yaml | ${{ env.SED }} > ./data-lite/proxy - curl -sSL https://github.com/blackmatrix7/ios_rule_script/raw/master/rule/Clash/Spotify/Spotify.yaml | ${{ env.SED }} > ./data-lite/spotify - curl -sSL https://github.com/blackmatrix7/ios_rule_script/raw/master/rule/Clash/Telegram/Telegram.yaml | ${{ env.SED }} > ./data-lite/telegram curl -sSL https://github.com/blackmatrix7/ios_rule_script/raw/master/rule/Clash/Twitter/Twitter.yaml | ${{ env.SED }} > ./data-lite/twitter curl -sSL https://github.com/blackmatrix7/ios_rule_script/raw/master/rule/Clash/TikTok/TikTok.yaml | ${{ env.SED }} > ./data-lite/tiktok - curl -sSL https://github.com/blackmatrix7/ios_rule_script/raw/master/rule/Clash/YouTube/YouTube.yaml | ${{ env.SED }} > ./data-lite/youtube echo include:google >> ./data-lite/proxy && echo include:github >> ./data-lite/proxy && echo include:netflix >> ./data-lite/proxy echo ipleak.net >> ./data-lite/proxy && echo browserleaks.org >> ./data-lite/proxy - - - sed -i 's/data\"/data-list\"/g' main.go && sed -i 's/geosite.dat/geosite-lite.dat/g' main.go - go run ./ --datapath=./data-lite + go run ./ --datapath=./data-lite --outputname geosite-lite.dat - name: Get geoip.dat relative files run: | From 3a00217fc07e56e696553ecb3be3586544ef0433 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=90=E6=AE=87?= <95160953+xishang0128@users.noreply.github.com> Date: Wed, 12 Apr 2023 16:08:23 +0800 Subject: [PATCH 4/5] Update run.yml --- .github/workflows/run.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index 47613b4141..bcaffb0881 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -226,10 +226,9 @@ jobs: wget https://github.com/xishang0128/meta-rules-dat/releases/download/v2box/v2box chmod 755 v2box ./v2box migrate geosite -i ../custom/publish/geosite.dat -o ./geosite.db - ./v2box migrate geosite -i ../custom/publish//geosite-lite.dat -o ./geosite-lite.db + ./v2box migrate geosite -i ../community/geosite-lite.dat -o ./geosite-lite.db ./v2box migrate geoip -i ../geoip.dat -o ./geoip.db ./v2box migrate geoip -i ../geoip-lite.dat -o ./geoip-lite.db - - name: Move and zip files run: | mkdir -p ./publish/ @@ -238,8 +237,7 @@ jobs: install -Dp ./geoip-lite.dat ./publish/ install -Dp ./geoip.dat ./publish/ install -Dp ./custom/publish/geosite.dat ./publish/ - install -Dp ./custom/publish/geosite-lite.dat ./publish/ - + install -Dp ./community/geosite-lite.dat ./publish/ install -Dp ./v2box/geosite.db ./publish/ install -Dp ./v2box/geosite-lite.db ./publish/ install -Dp ./v2box/geoip.db ./publish/ From 3b9e2ebbdfe43e1c96d2c03450253c3ab1d5eeb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=90=E6=AE=87?= <95160953+xishang0128@users.noreply.github.com> Date: Thu, 13 Apr 2023 20:59:33 +0800 Subject: [PATCH 5/5] Update run.yml --- .github/workflows/run.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index bcaffb0881..aace110f0c 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -187,6 +187,8 @@ jobs: mkdir -p data-lite curl -sSL https://raw.githubusercontent.com/xishang0128/rules/main/biliintl.list > ./data-lite/biliintl curl -sSL https://github.com/v2fly/domain-list-community/raw/master/data/ehentai > ./data-lite/ehentai + curl -sSL https://github.com/v2fly/domain-list-community/raw/master/data/private > ./data-lite/private + curl -sSL https://github.com/blackmatrix7/ios_rule_script/raw/master/rule/Clash/AbemaTV/AbemaTV.yaml | ${{ env.SED }} > ./data-lite/abema curl -sSL https://github.com/blackmatrix7/ios_rule_script/raw/master/rule/Clash/Apple/Apple_Classical.yaml | ${{ env.SED }} > ./data-lite/apple curl -sSL https://github.com/blackmatrix7/ios_rule_script/raw/master/rule/Clash/AppleMusic/AppleMusic.yaml | ${{ env.SED }} > ./data-lite/applemusic