From be315871f6a06fb2cc16f9a66378a7a146a60c1a 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 17:35:05 +0800 Subject: [PATCH 1/7] Update run.yml --- .github/workflows/run.yml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index 2899996dea..3bf5a5726f 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -197,10 +197,10 @@ jobs: sort ./cn | uniq -i > data-lite/cn go run ./ --datapath=./data-lite --outputname geosite-lite.dat - - name: Checkout SagerNet/sing-geosite + - name: Checkout CHIZI-0618/sing-geosite uses: actions/checkout@v3 with: - repository: SagerNet/sing-geosite + repository: CHIZI-0618/sing-geosite path: sing-geosite - name: Build geosite-lite.db file @@ -208,19 +208,16 @@ jobs: NO_SKIP: true run: | cd sing-geosite || exit 1 - sed -i 's/geosite\.db/geosite-lite.db/g' main.go - sed -i 's/v2fly\/domain-list-community/xishang0128\/meta-rules-dat/g' main.go - sed -i 's/dlc/geosite-lite/g' main.go - go run -v . + cp ../custom/publish/geosite-lite.dat ./ + go run -v . geosite-lite.dat geosite-lite.db - name: Build geosite.db file env: NO_SKIP: true run: | cd sing-geosite || exit 1 - sed -i 's/geosite-lite\.db/geosite.db/g' main.go - sed -i 's/geosite-lite/geosite/g' main.go - go run -v . + cp ../custom/publish/geosite.dat ./ + go run -v . geosite.dat geosite.db - name: Checkout SagerNet/sing-geoip uses: actions/checkout@v3 From b6edbf3ac3f49476c0a4951bba452f0ab84a7422 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 17:38:33 +0800 Subject: [PATCH 2/7] 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 3bf5a5726f..ef5ec8eb89 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -208,7 +208,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: Build geosite.db file From 405b9d4a455ec4c7b303660840d00d562fdb561c 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 17:59:57 +0800 Subject: [PATCH 3/7] Update run.yml --- .github/workflows/run.yml | 49 +++++++++------------------------------ 1 file changed, 11 insertions(+), 38 deletions(-) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index ef5ec8eb89..165f023432 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -197,50 +197,23 @@ jobs: sort ./cn | uniq -i > data-lite/cn go run ./ --datapath=./data-lite --outputname geosite-lite.dat - - name: Checkout CHIZI-0618/sing-geosite - uses: actions/checkout@v3 - with: - repository: CHIZI-0618/sing-geosite - path: sing-geosite - - name: Build geosite-lite.db file + + + - name: Build db file env: NO_SKIP: true run: | - cd sing-geosite || exit 1 - cp ../community/geosite-lite.dat ./ - go run -v . geosite-lite.dat geosite-lite.db + mkdir -p v2box + cd v2box || exit 1 + wget https://github.com/xishang0128/meta-rules-dat/releases/download/v2box/v2box + chmod 755 v2box + ./v2box migrate geosite -i ../custom/publish/geosite.dat ./geosite.db + ./v2box migrate geosite -i ../community/geosite-lite.dat ./geosite-lite.db + ./v2box migrate geoip -i ../geoip.dat ./geoip.db + ./v2box migrate geoip -i ../geoip-lite.dat ./gepip-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 - with: - repository: SagerNet/sing-geoip - path: sing-geoip - - - name: Build geoip-lite.db file - env: - NO_SKIP: true - run: | - cd sing-geoip || exit 1 - sed -i 's/Dreamacro\/maxmind-geoip/xishang0128\/geoip/g' main.go - go run -v . - mv geoip.db geoip-lite.db - - - name: Build geoip.db - env: - NO_SKIP: true - run: | - cd sing-geoip || exit 1 - sed -i 's/xishang0128\/geoip/Loyalsoldier\/geoip/g' main.go - go run -v . - name: Move and zip files run: | From 7fa9dcbcea5107500ba239d0ba10bde4f237d28c 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 18:02:11 +0800 Subject: [PATCH 4/7] Update run.yml --- .github/workflows/run.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index 165f023432..0273865d0c 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -223,11 +223,12 @@ jobs: install -Dp ./geoip-lite.dat ./publish/ install -Dp ./geoip.dat ./publish/ install -Dp ./custom/publish/geosite.dat ./publish/ - install -Dp ./sing-geosite/geosite.db ./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/geoip-lite.db ./publish/ + + install -Dp ./v2box/geosite.db ./publish/ + install -Dp ./v2box/geosite-lite.db ./publish/ + install -Dp ./v2box/geoip.db ./publish/ + install -Dp ./v2box/geoip-lite.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 curl -sSL https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/rule/Clash/Proxy/Proxy_Domain.yaml | sed '/^\s*#/d' > ./publish/proxy.yaml cd ./publish || exit 1 From 7da38110cbb2d840f870bca3ff98cc63344b44e1 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 18:06:26 +0800 Subject: [PATCH 5/7] Update run.yml --- .github/workflows/run.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index 0273865d0c..be8ced59a9 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -208,10 +208,10 @@ jobs: cd v2box || exit 1 wget https://github.com/xishang0128/meta-rules-dat/releases/download/v2box/v2box chmod 755 v2box - ./v2box migrate geosite -i ../custom/publish/geosite.dat ./geosite.db - ./v2box migrate geosite -i ../community/geosite-lite.dat ./geosite-lite.db - ./v2box migrate geoip -i ../geoip.dat ./geoip.db - ./v2box migrate geoip -i ../geoip-lite.dat ./gepip-lite.db + ./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 geoip -i ../geoip.dat -o ./geoip.db + ./v2box migrate geoip -i ../geoip-lite.dat -o ./gepip-lite.db @@ -232,8 +232,6 @@ jobs: curl -sSL https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/rule/Clash/ChinaMax/ChinaMax_Domain.yaml | sed '/^\s*#/d' > ./publish/cn_domain.yaml curl -sSL https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/rule/Clash/Proxy/Proxy_Domain.yaml | sed '/^\s*#/d' > ./publish/proxy.yaml cd ./publish || exit 1 - sha256sum geosite.dat > geosite.dat.sha256sum - sha256sum geosite-lite.dat > geosite-lite.dat.sha256sum - name: Delete current release assets From 55045dd0e9e33e77c5f22d4f7212b89a4c2a9c49 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 18:09:02 +0800 Subject: [PATCH 6/7] 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 be8ced59a9..6666ae9171 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -228,7 +228,7 @@ jobs: install -Dp ./v2box/geosite.db ./publish/ install -Dp ./v2box/geosite-lite.db ./publish/ install -Dp ./v2box/geoip.db ./publish/ - install -Dp ./v2box/geoip-lite.db ./publish/ + install -Dp ./v2box/gepip-lite.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 curl -sSL https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/rule/Clash/Proxy/Proxy_Domain.yaml | sed '/^\s*#/d' > ./publish/proxy.yaml cd ./publish || exit 1 From 6c5c8ff68d8fb9a119224d921ee8ab0811c8495b 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 18:09:34 +0800 Subject: [PATCH 7/7] 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 6666ae9171..3ab4ebccdd 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -211,7 +211,7 @@ jobs: ./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 geoip -i ../geoip.dat -o ./geoip.db - ./v2box migrate geoip -i ../geoip-lite.dat -o ./gepip-lite.db + ./v2box migrate geoip -i ../geoip-lite.dat -o ./geoip-lite.db @@ -228,7 +228,7 @@ jobs: install -Dp ./v2box/geosite.db ./publish/ install -Dp ./v2box/geosite-lite.db ./publish/ install -Dp ./v2box/geoip.db ./publish/ - install -Dp ./v2box/gepip-lite.db ./publish/ + install -Dp ./v2box/geoip-lite.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 curl -sSL https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/rule/Clash/Proxy/Proxy_Domain.yaml | sed '/^\s*#/d' > ./publish/proxy.yaml cd ./publish || exit 1