Update README.md

add asn
Update run.yml
2025-07-19 05:03:58 +00:00 · 2024-10-15 07:56:03 +08:00 · 2024-10-14 02:36:41 +08:00 · 2024-09-11 19:18:27 +08:00 · 2024-07-30 19:48:03 +08:00 · 2024-07-30 18:06:35 +08:00
2 changed files with 45 additions and 40 deletions
--- a/.github/workflows/run.yml
+++ b/.github/workflows/run.yml
@ -43,6 +43,12 @@ jobs:
          repository: v2fly/domain-list-community
          path: community

+      - name: Checkout MetaCubeX/meta-rules-converter
+        uses: actions/checkout@v4
+        with:
+          repository: MetaCubeX/meta-rules-converter
+          path: convert
+
      - name: Checkout cokebar/gfwlist2dnsmasq
        uses: actions/checkout@v4
        with:
@ -55,11 +61,6 @@ jobs:
          go-version: '1.22'
          cache-dependency-path: ./custom/go.sum

-      - name: Get geoip.dat relative files
-        run: |
-          wget https://github.com/Loyalsoldier/geoip/raw/release/geoip.dat
-          wget https://github.com/Loyalsoldier/geoip/raw/release/geoip.dat.sha256sum
-
      - name: Generate GFWList domains
        run: |
          cd gfwlist2dnsmasq || exit 1
@ -194,11 +195,12 @@ jobs:
          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
-          curl -sSL https://github.com/blackmatrix7/ios_rule_script/blob/master/rule/Clash/GlobalMedia/GlobalMedia.yaml | ${{ env.SED }} > ./data-lite/proxymedia
+          curl -sSL https://github.com/blackmatrix7/ios_rule_script/raw/master/rule/Clash/GlobalMedia/GlobalMedia.yaml | ${{ env.SED }} > ./data-lite/proxymedia

          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
          echo "full:o33249.ingest.sentry.io" >>  ./data-lite/openai
+          echo "openai.com" >> ./data-lite/openai
          go run ./ --datapath=./data-lite --outputname geosite-lite.dat

      - name: Get geoip.dat relative files
@ -222,48 +224,47 @@ jobs:
        env:
          NO_SKIP: true
        run: |
-          mkdir -p ./sing-rule/geo
-          cp ./geoip.dat ./geosite.db ./resouces/convert.sh ./sing-rule/geo/ 
-          cd ./sing-rule/geo
-          wget https://github.com/SagerNet/sing-box/releases/download/v1.8.0-alpha.1/sing-box-1.8.0-alpha.1-linux-amd64.tar.gz -O sing-box.tar.gz && tar zxvf sing-box.tar.gz && mv sing-box-1.8.0-alpha.1-linux-amd64/sing-box ./ && rm -r sing-box-1.8.0-alpha.1-linux-amd64
-          wget https://github.com/IrineSistiana/mosdns/releases/download/v4.5.3/mosdns-linux-amd64.zip -O mosdns.zip && unzip mosdns.zip
-          chmod 755 mosdns sing-box convert.sh && ./convert.sh
-          rm mosdns* sing-box* convert.sh geoip.dat geosite.db LICENSE README.md config.yaml
-
+          mkdir -p sing-rule/geo/geosite && mkdir -p sing-rule/geo/geoip
+          cd convert
+          go run ./ geosite -f ../custom/publish/geosite.dat -o ../sing-rule/geo/geosite -t sing-box
+          go run ./ geoip -f ../geoip.dat -o ../sing-rule/geo/geoip -t sing-box

      - name: Convert geo-lite to sing-rule-set
        env:
          NO_SKIP: true
        run: |
-          mkdir -p ./sing-rule/geo-lite
-          cp ./geoip-lite.dat ./sing-rule/geo-lite/geoip.dat && cp ./geosite-lite.db ./sing-rule/geo-lite/geosite.db && cp ./resouces/convert.sh ./sing-rule/geo-lite/ 
-          cd ./sing-rule/geo-lite
-          wget https://github.com/SagerNet/sing-box/releases/download/v1.8.0-alpha.1/sing-box-1.8.0-alpha.1-linux-amd64.tar.gz -O sing-box.tar.gz && tar zxvf sing-box.tar.gz && mv sing-box-1.8.0-alpha.1-linux-amd64/sing-box ./ && rm -r sing-box-1.8.0-alpha.1-linux-amd64
-          wget https://github.com/IrineSistiana/mosdns/releases/download/v4.5.3/mosdns-linux-amd64.zip -O mosdns.zip && unzip mosdns.zip
-          chmod 755 mosdns sing-box convert.sh && ./convert.sh
-          rm mosdns* sing-box* convert.sh geoip.dat geosite.db LICENSE README.md config.yaml
+          mkdir -p sing-rule/geo-lite/geosite && mkdir -p sing-rule/geo-lite/geoip
+          cd convert
+          go run ./ geosite -f ../community/geosite-lite.dat -o ../sing-rule/geo-lite/geosite -t sing-box
+          go run ./ geoip -f ../geoip-lite.dat -o ../sing-rule/geo-lite/geoip -t sing-box

      - name: Convert geo to meta-rule-set
        env:
          NO_SKIP: true
        run: |
-          mkdir -p ./meta-rule/geo
-          cp ./geoip.dat ./custom/publish/geosite.dat ./resouces/convert-clash.sh ./meta-rule/geo/ 
-          cd ./meta-rule/geo
-          wget https://github.com/IrineSistiana/mosdns/releases/download/v4.5.3/mosdns-linux-amd64.zip -O mosdns.zip && unzip mosdns.zip
-          chmod 755 mosdns convert-clash.sh && ./convert-clash.sh
-          rm mosdns* convert-clash.sh geoip.dat geosite.dat LICENSE README.md config.yaml
+          mkdir -p meta-rule/geo/geosite && mkdir -p meta-rule/geo/geoip
+          cd convert
+          go run ./ geosite -f ../custom/publish/geosite.dat -o ../meta-rule/geo/geosite
+          go run ./ geoip -f ../geoip.dat -o ../meta-rule/geo/geoip

      - name: Convert geo-lite to meta-rule-set
        env:
          NO_SKIP: true
        run: |
-          mkdir -p ./meta-rule/geo-lite
-          cp ./geoip-lite.dat ./meta-rule/geo-lite/geoip.dat && cp ./community/geosite-lite.dat ./meta-rule/geo-lite/geosite.dat && cp ./resouces/convert-clash.sh ./meta-rule/geo-lite/ 
-          cd ./meta-rule/geo-lite
-          wget https://github.com/IrineSistiana/mosdns/releases/download/v4.5.3/mosdns-linux-amd64.zip -O mosdns.zip && unzip mosdns.zip
-          chmod 755 mosdns convert-clash.sh && ./convert-clash.sh
-          rm mosdns* convert-clash.sh geoip.dat geosite.dat LICENSE README.md config.yaml
+          mkdir -p meta-rule/geo-lite/geosite && mkdir -p meta-rule/geo-lite/geoip
+          cd convert
+          go run ./ geosite -f ../community/geosite-lite.dat -o ../meta-rule/geo-lite/geosite
+          go run ./ geoip -f ../geoip-lite.dat -o ../meta-rule/geo-lite/geoip
+
+      - name: Convert asn
+        env:
+          NO_SKIP: true
+        run: |
+          mkdir -p meta-rule/asn && mkdir -p sing-rule/asn
+          cd convert
+          wget https://raw.githubusercontent.com/xishang0128/geoip/release/GeoLite2-ASN.mmdb
+          go run ./ asn -o ../meta-rule/asn
+          go run ./ asn -o ../sing-rule/asn -t sing-box

      # - name: Convert bm7-rule-set to sing-rule-set
      #   env:
@ -282,6 +283,7 @@ jobs:
          mkdir -p ./publish/
          wget https://raw.githubusercontent.com/xishang0128/geoip/release/Country.mmdb -O ./publish/country-lite.mmdb
          wget https://raw.githubusercontent.com/Loyalsoldier/geoip/release/Country.mmdb -O ./publish/country.mmdb
+          wget https://raw.githubusercontent.com/xishang0128/geoip/release/GeoLite2-ASN.mmdb -O ./publish/GeoLite2-ASN.mmdb
          install -Dp ./geoip-lite.dat ./publish/
          install -Dp ./geoip.dat ./publish/
          install -Dp ./custom/publish/geosite.dat ./publish/
@ -293,6 +295,8 @@ jobs:
          install -Dp ./geoip.metadb ./publish/
          install -Dp ./geoip-lite.metadb ./publish/
          cd ./publish || exit 1
+          sha256sum country.mmdb > country.mmdb.sha256sum
+          sha256sum country-lite.mmdb > country-lite.mmdb.sha256sum
          sha256sum geoip-lite.dat > geoip-lite.dat.sha256sum
          sha256sum geoip.dat > geoip.dat.sha256sum
          sha256sum geosite.dat > geosite.dat.sha256sum
@ -303,6 +307,7 @@ jobs:
          sha256sum geoip-lite.db > geoip-lite.db.sha256sum
          sha256sum geoip.metadb > geoip.metadb.sha256sum
          sha256sum geoip-lite.metadb > geoip-lite.metadb.sha256sum
+          sha256sum GeoLite2-ASN.mmdb > GeoLite2-ASN.mmdb.sha256sum

      - name: Delete current release assets
        uses: andreaswilli/delete-release-assets-action@v3.0.0
@ -337,7 +342,6 @@ jobs:
      - name: Git push assets to "sing-rule" branch
        run: |
            cd sing-rule || exit 1
-            ls
            git init
            git config --local user.name "github-actions[bot]"
            git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
@ -350,7 +354,6 @@ jobs:
      - name: Git push assets to "meta-rule" branch
        run: |
            cd meta-rule || exit 1
-            ls
            git init
            git config --local user.name "github-actions[bot]"
            git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
--- a/README.md
+++ b/README.md
@ -9,15 +9,17 @@
 | country-lite.mmdb   | [下载](https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/country-lite.mmdb)                            | [下载](https://cdn.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/country-lite.mmdb)                                               | [下载](https://testingcf.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/country-lite.mmdb)                                               |
 | geoip-lite.dat      | [下载](https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geoip-lite.dat)                               | [下载](https://cdn.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geoip-lite.dat)                                                  | [下载](https://testingcf.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geoip-lite.dat)                                                  |
 | geoip-lite.db       | [下载](https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geoip-lite.db)                                | [下载](https://cdn.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geoip-lite.db)                                                   | [下载](https://testingcf.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geoip-lite.db)                                                   |
-| geoip-lite.mmdb     | [下载](https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geoip-lite.mmdb)                              | [下载](https://cdn.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geoip-lite.mmdb)                                                 | [下载](https://testingcf.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geoip-lite.mmdb)                                                 |
 | geosite.dat         | [下载](https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geosite.dat)                                  | [下载](https://cdn.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geosite.dat)                                                     | [下载](https://testingcf.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geosite.dat)                                                     |
 | geosite.db          | [下载](https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geosite.db)                                   | [下载](https://cdn.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geosite.db)                                                      | [下载](https://testingcf.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geosite.db)                                                      |
 | geosite-lite.dat    | [下载](https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geosite-lite.dat)                             | [下载](https://cdn.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geosite-lite.dat)                                                 | [下载](https://testingcf.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geosite-lite.dat)                                                 |
 | geosite-lite.db     | [下载](https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geosite-lite.db)                              | [下载](https://cdn.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geosite-lite.db)                                                 | [下载](https://testingcf.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geosite-lite.db)                                                 |
+| GeoLite2-ASN.mmdb   | [下载](https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/GeoLite2-ASN.mmdb)                              | [下载](https://cdn.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/GeoLite2-ASN.mmdb)                                                 | [下载](https://testingcf.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/GeoLite2-ASN.mmdb)                                                 |

 ### **rule-set**

-由此分支获取： [meta branch](https://github.com/MetaCubeX/meta-rules-dat/tree/meta)
+mihomo：[meta branch](https://github.com/MetaCubeX/meta-rules-dat/tree/meta)
+
+sing-box: [sing branch](https://github.com/MetaCubeX/meta-rules-dat/tree/sing)

 ## **country.mmdb,geoip.dat,geoip.db 内容**

@ -62,7 +64,7 @@

 ## **geosite-lite.dat,geosite-lite.db 内容**

-仅包含常用集合,cn 为精简集合,可能不全
+仅包含常用集合，cn 为精简集合，可能不全
 集合内容均来自 https://github.com/blackmatrix7/ios_rule_script/tree/master/rule/Clash

 集合包含 `abema / apple / applemusic / bilibili / biliintl / bahamut / cn / ehentai / google / github / microsoft / netflix / openai / onedrive / pixiv / proxy / spotify / telegram / twitter / tiktok / youtube / proxymedia`
@ -76,7 +78,7 @@ rule-providers:
    interval: 86400
    path: ./provider/rule-set/cn_domain.yaml
    type: http
-    url: "https://testingcf.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/cn_domain.yaml"
+    url: "https://raw.githubusercontent.com/MetaCubeX/meta-rules-dat/meta/geo/geosite/cn.yaml"

 rules:
  - RULE-SET,cn,DIRECT
@ -96,7 +98,7 @@ rules:
  - GEOSITE,geolocation-!cn,PROXY
  - GEOSITE,cn,DIRECT

-  #GEOIP规则
+  #GEOIP 规则
  - GEOIP,private,DIRECT,no-resolve
  - GEOIP,telegram,PROXY
  - GEOIP,JP,PROXY
Author	SHA1	Message	Date
xishang0128	2838a39e41	Update README.md	2024-10-15 07:56:03 +08:00
xishang0128	9c2b3805e8	add asn	2024-10-14 02:36:41 +08:00
汐殇	d5af68f592	Update run.yml	2024-09-11 19:18:27 +08:00
汐殇	40504e187e	Update run.yml	2024-07-30 19:48:03 +08:00
TargetLocked	5a8952542e	fix: incorrect path while building sing-rule-set	2024-07-30 18:06:35 +08:00
xishang0128	07ea92c880	update	2024-07-30 08:08:47 +08:00
汐殇	002e10591f	Update run.yml	2024-06-16 20:38:07 +08:00
xishang0128	35af46280b	update	2024-06-12 20:15:30 +08:00
汐殇	ebc8329e9b	Update run.yml	2024-05-23 22:10:58 +08:00
汐殇	f3d7c2185d	Update README.md	2024-05-12 05:20:21 +08:00
Larvan2	c5ccb1fa53	Update README.md	2024-04-30 15:34:19 +08:00
Larvan2	7c1a63dcfa	Update run.yml	2024-04-30 15:32:09 +08:00