From 79aee2c016419f20184e1faccf45b304f0af62b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=90=E6=AE=87?= <95160953+xishang0128@users.noreply.github.com> Date: Mon, 10 Apr 2023 04:52:49 +0800 Subject: [PATCH 01/11] Update run.yml --- .github/workflows/run.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index 137e2e584e..0c746688b1 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -185,6 +185,12 @@ jobs: cd custom || exit 1 go run ./ --datapath=../community/data + - name: Build geosite-lite.dat file + run: | + cd community || exit 1 + cp -f data/{cn,tld-cn,geolocation-cn,jiguang,umeng,aws-cn,baijiayun,bootcdn,umeng-ads,bootcss,cloudflare-cn,dwion,maocloud,pkoplink,qingcloud,qiniu,staticfile,snodehome,ucloud,upai,wangsu,yunfanjiasu,category-bank-cn,boc,category-securities-cn,ccb,citic,cmb,icbc,eastmoney,everbright,pingan,unionpay,taikang,58tongcheng,ganji,ctrip,dangdang,eleme,jd,jd-ads,lianjia,manmanbuy,meituan,miaomiaozhe,mogujie,pinduoduo,smzdm,suning,tongcheng,vancl,youzan,ziroom,3dm,4399,acfun,acfun-ads,acplay,ali213,bilibili,ciweimao,cowlevel,dedao,dmzj,douyu,duitang,gamersky,gcores,gitv,huya,iqiyi,jinjiang,iqiyi-ads,ku6,kuaikan,kuaishou,kugou,le,lizhi,kuaishou-ads,mfuns,miaopai,mihoyo-cn,muwai,pptv,qingtingfm,sfacg,taomee,taptap,tgbus,tiancity,u17,vgtime,xiaohongshu,ximalaya,youku,yy,zhanqi,duowan,chiphell,erji,hacpai,kechuang,nga,stage1st,ipip,sf-express,category-media-cn,36kr,cctv,chinanews,category-hospital-cn,category-network-security-cn,dgtle,115,geekpark,hupu,3type,4paradigm,51job,afdian,agora,antutu,bitauto,category-collaborate-cn,ifanr,category-documents-cn,capitalonline,doc88,chinaso,docin,chinaz,jiemian,colorfulclouds,coolapk,cowtransfer,landian,dida365,flowus,foundertype,geetest,hanyi,jianshu,jinshuju,phoenix,hellofont,ruanmei,keep,lagou,sohu,solidot,sspai,lanzou,tmtpost,ldmnq,liepin,weiphone,mafengwo,ynet,xueqiu,meitu,moji,nowcoder,polyv,renren,vaptcha,wiwide,wjx,wolai,yinxiang,zdns,category-education-cn,category-mooc-cn,17zuoye,category-scholar-cn,cas,chaoxing,category-wiki-cn,applysquare,cnki,cugbonline,guokr,ihuman,wanfang,category-social-media-cn,bcy,category-dev-cn,51nod,aixcoder,alibaba,cnblogs,b3log,douban,gracg,baidu,coding,hujiang,baidu-ads,bytedance,zuoyebang,didi,sina,zhihu,alibaba-ads,huawei,sina-ads,alibabacloud,koolearn,aliyun,shanbay,xueersi,juejin,iflytek,kingsoft,csdn,deepin,gitee,lark,dingtalk,cheetahmobile,huawei-dev,meizu,tiktok,huaweicloud,yuanfudao,goproxy,jinrishici,teambition,netease,kuaiyikeji,oppo,uc,netease-ads,oneplus,oschina,seasun,pgyer,rubychina,zhihuishu,segmentfault,wps,qihoo360,sogou,sxl,75team,tencent,xiaomi,tipdm,xunlei,ubuntukylin,chinabroadnet,chinamobile,chinatelecom,qcloud,ctexcel,chinaunicom,j-test,tencent-ads,nat-test,category-food-cn,tencent-dev,tencent-games,xueyuanjun,airchina,yuewen,discuz,dnspod,hainanairlines,8btc,jibencaozuo,bestore,sinopec,category-enterprise-query-platform-cn,bjyouth,sumkoo,lkcoffee,heytea,aiqicha,hongdunwang,qcc,qichamao,qixin,qyyjt,tianyancha,x315} ./data-lite + go run ./ --datapath=../data-lite --outputname geosite-lite.dat + - name: Checkout SagerNet/sing-geosite uses: actions/checkout@v3 with: @@ -199,6 +205,14 @@ jobs: cp ../custom/publish/geosite.dat ./ go run -v . geosite.dat geosite.db + - name: Build geosite-lite.db file + env: + NO_SKIP: true + run: | + cd sing-geosite || exit 1 + cp ../custom/publish/geosite-lite.dat ./ + go run -v . geosite-lite.dat geosite-lite.db + - name: Checkout SagerNet/sing-geoip uses: actions/checkout@v3 with: @@ -231,6 +245,8 @@ jobs: install -Dp ./geoip.dat ./publish/ install -Dp ./custom/publish/geosite.dat ./publish/ install -Dp ./sing-geosite/geosite.db ./publish/ + install -Dp ./custom/publish/geosite-lite.dat ./publish/ + install -Dp ./sing-geosite/geosite-lite.db ./publish/ install -Dp ./sing-geoip/geoip.db ./publish/ install -Dp ./sing-geoip/cn.db ./publish/ curl -sSL https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/rule/Clash/ChinaMax/ChinaMax_Domain.yaml | sed '/^\s*#/d' > ./publish/cn_domain.yaml From c6675f25c6c8878700db807fbfa5b1a60bb907fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=90=E6=AE=87?= <95160953+xishang0128@users.noreply.github.com> Date: Mon, 10 Apr 2023 04:54:18 +0800 Subject: [PATCH 02/11] Update run.yml --- .github/workflows/run.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index 0c746688b1..175e505bcd 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -188,8 +188,9 @@ jobs: - name: Build geosite-lite.dat file run: | cd community || exit 1 + mkdir -p data-lite cp -f data/{cn,tld-cn,geolocation-cn,jiguang,umeng,aws-cn,baijiayun,bootcdn,umeng-ads,bootcss,cloudflare-cn,dwion,maocloud,pkoplink,qingcloud,qiniu,staticfile,snodehome,ucloud,upai,wangsu,yunfanjiasu,category-bank-cn,boc,category-securities-cn,ccb,citic,cmb,icbc,eastmoney,everbright,pingan,unionpay,taikang,58tongcheng,ganji,ctrip,dangdang,eleme,jd,jd-ads,lianjia,manmanbuy,meituan,miaomiaozhe,mogujie,pinduoduo,smzdm,suning,tongcheng,vancl,youzan,ziroom,3dm,4399,acfun,acfun-ads,acplay,ali213,bilibili,ciweimao,cowlevel,dedao,dmzj,douyu,duitang,gamersky,gcores,gitv,huya,iqiyi,jinjiang,iqiyi-ads,ku6,kuaikan,kuaishou,kugou,le,lizhi,kuaishou-ads,mfuns,miaopai,mihoyo-cn,muwai,pptv,qingtingfm,sfacg,taomee,taptap,tgbus,tiancity,u17,vgtime,xiaohongshu,ximalaya,youku,yy,zhanqi,duowan,chiphell,erji,hacpai,kechuang,nga,stage1st,ipip,sf-express,category-media-cn,36kr,cctv,chinanews,category-hospital-cn,category-network-security-cn,dgtle,115,geekpark,hupu,3type,4paradigm,51job,afdian,agora,antutu,bitauto,category-collaborate-cn,ifanr,category-documents-cn,capitalonline,doc88,chinaso,docin,chinaz,jiemian,colorfulclouds,coolapk,cowtransfer,landian,dida365,flowus,foundertype,geetest,hanyi,jianshu,jinshuju,phoenix,hellofont,ruanmei,keep,lagou,sohu,solidot,sspai,lanzou,tmtpost,ldmnq,liepin,weiphone,mafengwo,ynet,xueqiu,meitu,moji,nowcoder,polyv,renren,vaptcha,wiwide,wjx,wolai,yinxiang,zdns,category-education-cn,category-mooc-cn,17zuoye,category-scholar-cn,cas,chaoxing,category-wiki-cn,applysquare,cnki,cugbonline,guokr,ihuman,wanfang,category-social-media-cn,bcy,category-dev-cn,51nod,aixcoder,alibaba,cnblogs,b3log,douban,gracg,baidu,coding,hujiang,baidu-ads,bytedance,zuoyebang,didi,sina,zhihu,alibaba-ads,huawei,sina-ads,alibabacloud,koolearn,aliyun,shanbay,xueersi,juejin,iflytek,kingsoft,csdn,deepin,gitee,lark,dingtalk,cheetahmobile,huawei-dev,meizu,tiktok,huaweicloud,yuanfudao,goproxy,jinrishici,teambition,netease,kuaiyikeji,oppo,uc,netease-ads,oneplus,oschina,seasun,pgyer,rubychina,zhihuishu,segmentfault,wps,qihoo360,sogou,sxl,75team,tencent,xiaomi,tipdm,xunlei,ubuntukylin,chinabroadnet,chinamobile,chinatelecom,qcloud,ctexcel,chinaunicom,j-test,tencent-ads,nat-test,category-food-cn,tencent-dev,tencent-games,xueyuanjun,airchina,yuewen,discuz,dnspod,hainanairlines,8btc,jibencaozuo,bestore,sinopec,category-enterprise-query-platform-cn,bjyouth,sumkoo,lkcoffee,heytea,aiqicha,hongdunwang,qcc,qichamao,qixin,qyyjt,tianyancha,x315} ./data-lite - go run ./ --datapath=../data-lite --outputname geosite-lite.dat + go run ./ --datapath=./data-lite --outputname geosite-lite.dat - name: Checkout SagerNet/sing-geosite uses: actions/checkout@v3 From 83217106567feaf9db8dac85b389696fe1adcb5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=90=E6=AE=87?= <95160953+xishang0128@users.noreply.github.com> Date: Mon, 10 Apr 2023 04:56:44 +0800 Subject: [PATCH 03/11] Update run.yml --- .github/workflows/run.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index 175e505bcd..744959a067 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -211,7 +211,7 @@ jobs: NO_SKIP: true run: | cd sing-geosite || exit 1 - cp ../custom/publish/geosite-lite.dat ./ + cp ../community/geosite-lite.dat ./ go run -v . geosite-lite.dat geosite-lite.db - name: Checkout SagerNet/sing-geoip @@ -246,7 +246,7 @@ jobs: install -Dp ./geoip.dat ./publish/ install -Dp ./custom/publish/geosite.dat ./publish/ install -Dp ./sing-geosite/geosite.db ./publish/ - install -Dp ./custom/publish/geosite-lite.dat ./publish/ + install -Dp ./community/geosite-lite.dat ./publish/ install -Dp ./sing-geosite/geosite-lite.db ./publish/ install -Dp ./sing-geoip/geoip.db ./publish/ install -Dp ./sing-geoip/cn.db ./publish/ From 9cfd78b83a4e18421de615e0b106473fc2c049e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=90=E6=AE=87?= <95160953+xishang0128@users.noreply.github.com> Date: Mon, 10 Apr 2023 05:01:27 +0800 Subject: [PATCH 04/11] Update run.yml --- .github/workflows/run.yml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index 744959a067..2c2fe01ea2 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -186,6 +186,8 @@ jobs: go run ./ --datapath=../community/data - name: Build geosite-lite.dat file + env: + NO_SKIP: true run: | cd community || exit 1 mkdir -p data-lite @@ -198,13 +200,6 @@ jobs: repository: SagerNet/sing-geosite path: sing-geosite - - name: Build geosite.db file - env: - NO_SKIP: true - run: | - cd sing-geosite || exit 1 - cp ../custom/publish/geosite.dat ./ - go run -v . geosite.dat geosite.db - name: Build geosite-lite.db file env: @@ -212,7 +207,16 @@ jobs: run: | cd sing-geosite || exit 1 cp ../community/geosite-lite.dat ./ - go run -v . geosite-lite.dat geosite-lite.db + go run -v . geosite-lite.dat geosite.db + mv geosite.db geosite-lite.db + + - name: Build geosite.db file + env: + NO_SKIP: true + run: | + cd sing-geosite || exit 1 + cp ../custom/publish/geosite.dat ./ + go run -v . geosite.dat geosite.db - name: Checkout SagerNet/sing-geoip uses: actions/checkout@v3 From 63c2ddbddccc1795cc1f90e3f06accbcac80383f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=90=E6=AE=87?= <95160953+xishang0128@users.noreply.github.com> Date: Mon, 10 Apr 2023 05:20:56 +0800 Subject: [PATCH 05/11] Update run.yml --- .github/workflows/run.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index 2c2fe01ea2..84efaca026 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -191,7 +191,10 @@ jobs: run: | cd community || exit 1 mkdir -p data-lite - cp -f data/{cn,tld-cn,geolocation-cn,jiguang,umeng,aws-cn,baijiayun,bootcdn,umeng-ads,bootcss,cloudflare-cn,dwion,maocloud,pkoplink,qingcloud,qiniu,staticfile,snodehome,ucloud,upai,wangsu,yunfanjiasu,category-bank-cn,boc,category-securities-cn,ccb,citic,cmb,icbc,eastmoney,everbright,pingan,unionpay,taikang,58tongcheng,ganji,ctrip,dangdang,eleme,jd,jd-ads,lianjia,manmanbuy,meituan,miaomiaozhe,mogujie,pinduoduo,smzdm,suning,tongcheng,vancl,youzan,ziroom,3dm,4399,acfun,acfun-ads,acplay,ali213,bilibili,ciweimao,cowlevel,dedao,dmzj,douyu,duitang,gamersky,gcores,gitv,huya,iqiyi,jinjiang,iqiyi-ads,ku6,kuaikan,kuaishou,kugou,le,lizhi,kuaishou-ads,mfuns,miaopai,mihoyo-cn,muwai,pptv,qingtingfm,sfacg,taomee,taptap,tgbus,tiancity,u17,vgtime,xiaohongshu,ximalaya,youku,yy,zhanqi,duowan,chiphell,erji,hacpai,kechuang,nga,stage1st,ipip,sf-express,category-media-cn,36kr,cctv,chinanews,category-hospital-cn,category-network-security-cn,dgtle,115,geekpark,hupu,3type,4paradigm,51job,afdian,agora,antutu,bitauto,category-collaborate-cn,ifanr,category-documents-cn,capitalonline,doc88,chinaso,docin,chinaz,jiemian,colorfulclouds,coolapk,cowtransfer,landian,dida365,flowus,foundertype,geetest,hanyi,jianshu,jinshuju,phoenix,hellofont,ruanmei,keep,lagou,sohu,solidot,sspai,lanzou,tmtpost,ldmnq,liepin,weiphone,mafengwo,ynet,xueqiu,meitu,moji,nowcoder,polyv,renren,vaptcha,wiwide,wjx,wolai,yinxiang,zdns,category-education-cn,category-mooc-cn,17zuoye,category-scholar-cn,cas,chaoxing,category-wiki-cn,applysquare,cnki,cugbonline,guokr,ihuman,wanfang,category-social-media-cn,bcy,category-dev-cn,51nod,aixcoder,alibaba,cnblogs,b3log,douban,gracg,baidu,coding,hujiang,baidu-ads,bytedance,zuoyebang,didi,sina,zhihu,alibaba-ads,huawei,sina-ads,alibabacloud,koolearn,aliyun,shanbay,xueersi,juejin,iflytek,kingsoft,csdn,deepin,gitee,lark,dingtalk,cheetahmobile,huawei-dev,meizu,tiktok,huaweicloud,yuanfudao,goproxy,jinrishici,teambition,netease,kuaiyikeji,oppo,uc,netease-ads,oneplus,oschina,seasun,pgyer,rubychina,zhihuishu,segmentfault,wps,qihoo360,sogou,sxl,75team,tencent,xiaomi,tipdm,xunlei,ubuntukylin,chinabroadnet,chinamobile,chinatelecom,qcloud,ctexcel,chinaunicom,j-test,tencent-ads,nat-test,category-food-cn,tencent-dev,tencent-games,xueyuanjun,airchina,yuewen,discuz,dnspod,hainanairlines,8btc,jibencaozuo,bestore,sinopec,category-enterprise-query-platform-cn,bjyouth,sumkoo,lkcoffee,heytea,aiqicha,hongdunwang,qcc,qichamao,qixin,qyyjt,tianyancha,x315} ./data-lite + curl -sSL ${CHINA_DOMAINS_URL} | sed '/^\s*#/d' | sed '/^[^\.]/ s/^/full: /' | sed 's/^\.\([^.]*\)/\1/' > cn + curl -sSL ${CUSTOM_DIRECT} | perl -ne '/^(domain):([^:]+)(\n$|:@.+)/ && print "$2\n"' >> cn + curl -sSL ${CUSTOM_DIRECT} | perl -ne '/^((full|regexp|keyword):[^:]+)(\n$|:@.+)/ && print "$1\n"' | sort --ignore-case -u >> cn + sort ./cn | uniq -i > ./data-lite/cn | rm cn go run ./ --datapath=./data-lite --outputname geosite-lite.dat - name: Checkout SagerNet/sing-geosite From dfb69317edb3b7f9fb3728ec38aa60533d596680 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=90=E6=AE=87?= <95160953+xishang0128@users.noreply.github.com> Date: Mon, 10 Apr 2023 05:27:32 +0800 Subject: [PATCH 06/11] Update run.yml --- .github/workflows/run.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index 84efaca026..e8a7acc6f9 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -194,7 +194,7 @@ jobs: curl -sSL ${CHINA_DOMAINS_URL} | sed '/^\s*#/d' | sed '/^[^\.]/ s/^/full: /' | sed 's/^\.\([^.]*\)/\1/' > cn curl -sSL ${CUSTOM_DIRECT} | perl -ne '/^(domain):([^:]+)(\n$|:@.+)/ && print "$2\n"' >> cn curl -sSL ${CUSTOM_DIRECT} | perl -ne '/^((full|regexp|keyword):[^:]+)(\n$|:@.+)/ && print "$1\n"' | sort --ignore-case -u >> cn - sort ./cn | uniq -i > ./data-lite/cn | rm cn + sort ./cn | uniq -i > ./data-lite/cn go run ./ --datapath=./data-lite --outputname geosite-lite.dat - name: Checkout SagerNet/sing-geosite From d6290f5db92328e09508136e0d5cfa5529b86766 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=90=E6=AE=87?= <95160953+xishang0128@users.noreply.github.com> Date: Mon, 10 Apr 2023 05:30:45 +0800 Subject: [PATCH 07/11] 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 e8a7acc6f9..1144b6d03f 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -191,9 +191,9 @@ jobs: run: | cd community || exit 1 mkdir -p data-lite - curl -sSL ${CHINA_DOMAINS_URL} | sed '/^\s*#/d' | sed '/^[^\.]/ s/^/full: /' | sed 's/^\.\([^.]*\)/\1/' > cn - curl -sSL ${CUSTOM_DIRECT} | perl -ne '/^(domain):([^:]+)(\n$|:@.+)/ && print "$2\n"' >> cn - curl -sSL ${CUSTOM_DIRECT} | perl -ne '/^((full|regexp|keyword):[^:]+)(\n$|:@.+)/ && print "$1\n"' | sort --ignore-case -u >> cn + curl -sSL https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/rule/Clash/ChinaMax/ChinaMax_Domain.txt | sed '/^\s*#/d' | sed '/^[^\.]/ s/^/full: /' | sed 's/^\.\([^.]*\)/\1/' > cn + curl -sSL https://raw.githubusercontent.com/Loyalsoldier/domain-list-custom/release/cn.txt | perl -ne '/^((full|regexp|keyword):[^:]+)(\n$|:@.+)/ && print "$1\n"' | sort --ignore-case -u >> cn + curl -sSL https://raw.githubusercontent.com/Loyalsoldier/domain-list-custom/release/cn.txt | perl -ne '/^(domain):([^:]+)(\n$|:@.+)/ && print "$2\n"' >> cn sort ./cn | uniq -i > ./data-lite/cn go run ./ --datapath=./data-lite --outputname geosite-lite.dat From ee104c5f582d2149133c08e9d13759cb6640aa5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=90=E6=AE=87?= <95160953+xishang0128@users.noreply.github.com> Date: Mon, 10 Apr 2023 05:34:43 +0800 Subject: [PATCH 08/11] Update run.yml --- .github/workflows/run.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index 1144b6d03f..4858eed955 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -192,9 +192,9 @@ jobs: cd community || exit 1 mkdir -p data-lite curl -sSL https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/rule/Clash/ChinaMax/ChinaMax_Domain.txt | sed '/^\s*#/d' | sed '/^[^\.]/ s/^/full: /' | sed 's/^\.\([^.]*\)/\1/' > cn - curl -sSL https://raw.githubusercontent.com/Loyalsoldier/domain-list-custom/release/cn.txt | perl -ne '/^((full|regexp|keyword):[^:]+)(\n$|:@.+)/ && print "$1\n"' | sort --ignore-case -u >> cn curl -sSL https://raw.githubusercontent.com/Loyalsoldier/domain-list-custom/release/cn.txt | perl -ne '/^(domain):([^:]+)(\n$|:@.+)/ && print "$2\n"' >> cn - sort ./cn | uniq -i > ./data-lite/cn + sort ./cn | uniq -i > data-lite/cn + curl -sSL https://raw.githubusercontent.com/Loyalsoldier/domain-list-custom/release/cn.txt | perl -ne '/^((full|regexp|keyword):[^:]+)(\n$|:@.+)/ && print "$1\n"' | sort --ignore-case -u >> data-list/cn go run ./ --datapath=./data-lite --outputname geosite-lite.dat - name: Checkout SagerNet/sing-geosite From ca4576dc4b6b9e0c6483543309ebfe0846e68add Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=90=E6=AE=87?= <95160953+xishang0128@users.noreply.github.com> Date: Mon, 10 Apr 2023 05:38:11 +0800 Subject: [PATCH 09/11] Update run.yml --- .github/workflows/run.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index 4858eed955..bb865fbfa6 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -193,8 +193,8 @@ jobs: mkdir -p data-lite curl -sSL https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/rule/Clash/ChinaMax/ChinaMax_Domain.txt | sed '/^\s*#/d' | sed '/^[^\.]/ s/^/full: /' | sed 's/^\.\([^.]*\)/\1/' > cn curl -sSL https://raw.githubusercontent.com/Loyalsoldier/domain-list-custom/release/cn.txt | perl -ne '/^(domain):([^:]+)(\n$|:@.+)/ && print "$2\n"' >> cn + curl -sSL https://raw.githubusercontent.com/Loyalsoldier/domain-list-custom/release/cn.txt | perl -ne '/^((full|regexp|keyword):[^:]+)(\n$|:@.+)/ && print "$1\n"' | sort --ignore-case -u >> cn sort ./cn | uniq -i > data-lite/cn - curl -sSL https://raw.githubusercontent.com/Loyalsoldier/domain-list-custom/release/cn.txt | perl -ne '/^((full|regexp|keyword):[^:]+)(\n$|:@.+)/ && print "$1\n"' | sort --ignore-case -u >> data-list/cn go run ./ --datapath=./data-lite --outputname geosite-lite.dat - name: Checkout SagerNet/sing-geosite From 6c0157865546499c4be96904a2e9ef52d011376e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=90=E6=AE=87?= <95160953+xishang0128@users.noreply.github.com> Date: Mon, 10 Apr 2023 05:42:15 +0800 Subject: [PATCH 10/11] Update run.yml --- .github/workflows/run.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index bb865fbfa6..49c7e330ad 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -185,9 +185,8 @@ jobs: cd custom || exit 1 go run ./ --datapath=../community/data - - name: Build geosite-lite.dat file - env: - NO_SKIP: true + + - name: Add `lite` data run: | cd community || exit 1 mkdir -p data-lite @@ -195,6 +194,12 @@ jobs: curl -sSL https://raw.githubusercontent.com/Loyalsoldier/domain-list-custom/release/cn.txt | perl -ne '/^(domain):([^:]+)(\n$|:@.+)/ && print "$2\n"' >> cn curl -sSL https://raw.githubusercontent.com/Loyalsoldier/domain-list-custom/release/cn.txt | perl -ne '/^((full|regexp|keyword):[^:]+)(\n$|:@.+)/ && print "$1\n"' | sort --ignore-case -u >> cn sort ./cn | uniq -i > data-lite/cn + + - name: Build geosite-lite.dat file + env: + NO_SKIP: true + run: | + cd community || exit 1 go run ./ --datapath=./data-lite --outputname geosite-lite.dat - name: Checkout SagerNet/sing-geosite From c2e8aed0d8995305475c328a63d72333ff1f78e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=90=E6=AE=87?= <95160953+xishang0128@users.noreply.github.com> Date: Mon, 10 Apr 2023 05:52:33 +0800 Subject: [PATCH 11/11] Update run.yml --- .github/workflows/run.yml | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index 49c7e330ad..f55a70a83c 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -185,21 +185,16 @@ jobs: cd custom || exit 1 go run ./ --datapath=../community/data - - - name: Add `lite` data - run: | - cd community || exit 1 - mkdir -p data-lite - curl -sSL https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/rule/Clash/ChinaMax/ChinaMax_Domain.txt | sed '/^\s*#/d' | sed '/^[^\.]/ s/^/full: /' | sed 's/^\.\([^.]*\)/\1/' > cn - curl -sSL https://raw.githubusercontent.com/Loyalsoldier/domain-list-custom/release/cn.txt | perl -ne '/^(domain):([^:]+)(\n$|:@.+)/ && print "$2\n"' >> cn - curl -sSL https://raw.githubusercontent.com/Loyalsoldier/domain-list-custom/release/cn.txt | perl -ne '/^((full|regexp|keyword):[^:]+)(\n$|:@.+)/ && print "$1\n"' | sort --ignore-case -u >> cn - sort ./cn | uniq -i > data-lite/cn - - name: Build geosite-lite.dat file env: NO_SKIP: true run: | cd community || exit 1 + mkdir -p data-lite + curl -sSL https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/rule/Clash/ChinaMax/ChinaMax_Domain.txt | sed '/^\s*#/d' | sed '/^[^\.]/ s/^/full:/' | sed 's/^\.\([^.]*\)/\1/' > cn + curl -sSL https://raw.githubusercontent.com/Loyalsoldier/domain-list-custom/release/cn.txt | perl -ne '/^(domain):([^:]+)(\n$|:@.+)/ && print "$2\n"' >> cn + curl -sSL https://raw.githubusercontent.com/Loyalsoldier/domain-list-custom/release/cn.txt | perl -ne '/^((full|regexp|keyword):[^:]+)(\n$|:@.+)/ && print "$1\n"' | sort --ignore-case -u >> cn + sort ./cn | uniq -i > data-lite/cn go run ./ --datapath=./data-lite --outputname geosite-lite.dat - name: Checkout SagerNet/sing-geosite