From 7e2a9dc879d19870228edd0329e5ccfa252f1f1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B1=90=E6=AE=87?=
 <95160953+xishang0128@users.noreply.github.com>
Date: Tue, 11 Apr 2023 02:18:49 +0800
Subject: [PATCH] Update run.yml

---
 .github/workflows/run.yml | 40 ++++++++++++++++++++++++++++-----------
 1 file changed, 29 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml
index 7e11c4a2..3efcc339 100644
--- a/.github/workflows/run.yml
+++ b/.github/workflows/run.yml
@@ -60,11 +60,6 @@ jobs:
           repository: cokebar/gfwlist2dnsmasq
           path: gfwlist2dnsmasq
 
-      - name: Get geoip.dat relative files
-        run: |
-          wget -O geoip-lite.dat https://github.com/xishang0128/geoip/raw/release/geoip.dat
-          wget https://github.com/Loyalsoldier/geoip/raw/release/geoip.dat
-
       - name: Generate GFWList domains
         run: |
           cd gfwlist2dnsmasq || exit 1
@@ -73,7 +68,7 @@ jobs:
 
       - name: Get and add direct domains into temp-direct.txt file
         run: |
-          curl -sSL ${CHINA_DOMAINS_URL} | sed '/^\s*#/d' | sed '/^[^\.]/ s/^/full: /' |  sed 's/^\.\([^.]*\)/\1/' > temp-direct.txt 
+          curl -sSL ${CHINA_DOMAINS_URL} | sed '/^\s*#/d' | sed '/^[^\.]/ s/^/full:/' |  sed 's/^\.\([^.]*\)/\1/' > temp-direct.txt 
           curl -sSL ${CUSTOM_DIRECT} | perl -ne '/^(domain):([^:]+)(\n$|:@.+)/ && print "$2\n"' >> temp-direct.txt
 
       - name: Get and add proxy domains into temp-proxy.txt file
@@ -187,23 +182,42 @@ jobs:
 
 
 
+
+
+
+
+
       - name: Build geosite-lite.dat file
         env:
           NO_SKIP: true
-          SED: sed '/^\s*#/d' | sed 's/^PROCESS-NAME,//' | sed 's/DOMAIN,/full:/g' | sed 's/DOMAIN-SUFFIX,//g' | sed 's/DOMAIN-KEYWORD,/keyword:/g'
+          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
           mkdir -p data-lite
           curl -sSL https://raw.githubusercontent.com/xishang0128/rules/main/biliintl.list > ./data-lite/biliintl
-          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://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/BiliBili/BiliBili.yaml | ${{ env.SED }} > ./data-lite/bilibili
+          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/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/Bahamut/Bahamut.yaml | ${{ env.SED }} > ./data-lite/bahamut
+          curl -sSL https://github.com/blackmatrix7/ios_rule_script/raw/master/rule/Clash/OpenAI/OpenAI.yaml | ${{ env.SED }} > ./data-lite/openai
+
           go run ./ --datapath=./data-lite --outputname geosite-lite.dat
 
 
 
 
+
+
+
+
+      - name: Get geoip.dat relative files
+        run: |
+          wget -O geoip-lite.dat https://github.com/xishang0128/geoip/raw/release/geoip.dat
+          wget https://github.com/Loyalsoldier/geoip/raw/release/geoip.dat
+
       - name: Build db file
         env:
           NO_SKIP: true
@@ -219,6 +233,10 @@ jobs:
 
 
 
+
+
+
+
       - name: Move and zip files
         run: |
           mkdir -p ./publish/