From c1eb97618bdafce08c429f95e1e40d37131fead8 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 15:28:52 +0800 Subject: [PATCH 1/7] Update run.yml --- .github/workflows/run.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index 6571d7840b..237dfd023e 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -204,15 +204,6 @@ jobs: path: sing-geosite - - name: Build geosite-lite.db file - env: - NO_SKIP: true - run: | - cd sing-geosite || exit 1 - cp ../community/geosite-lite.dat ./ - go run -v . geosite-lite.dat geosite.db - mv geosite.db geosite-lite.db - - name: Build geosite.db file env: NO_SKIP: true @@ -223,6 +214,16 @@ jobs: sed -i 's/dlc/geosite/g' main.go go run -v . + - name: Build geosite-lite.db file + env: + NO_SKIP: true + run: | + cd sing-geosite || exit 1 + sed -i 's/geosite-v2fly\.db/geosite.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 . + - name: Checkout SagerNet/sing-geoip uses: actions/checkout@v3 with: From cfd2662fec75f4b27673c5e363c3729e644e7724 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 15:30:48 +0800 Subject: [PATCH 2/7] Update run.yml --- .github/workflows/run.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index 237dfd023e..853137cb71 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -203,6 +203,16 @@ jobs: repository: SagerNet/sing-geosite path: sing-geosite + - name: Build geosite-lite.db file + env: + NO_SKIP: true + run: | + cd sing-geosite || exit 1 + sed -i 's/geosite-v2fly\.db/geosite.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 . + mv geosite.db geosite-lite.db - name: Build geosite.db file env: @@ -214,16 +224,6 @@ jobs: sed -i 's/dlc/geosite/g' main.go go run -v . - - name: Build geosite-lite.db file - env: - NO_SKIP: true - run: | - cd sing-geosite || exit 1 - sed -i 's/geosite-v2fly\.db/geosite.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 . - - name: Checkout SagerNet/sing-geoip uses: actions/checkout@v3 with: From e0b8f2e8685ca371cdb8a4da4e355296d14b092f 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 15:34:40 +0800 Subject: [PATCH 3/7] Update run.yml --- .github/workflows/run.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index 853137cb71..cc4ce9c3ac 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -203,16 +203,6 @@ jobs: repository: SagerNet/sing-geosite path: sing-geosite - - name: Build geosite-lite.db file - env: - NO_SKIP: true - run: | - cd sing-geosite || exit 1 - sed -i 's/geosite-v2fly\.db/geosite.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 . - mv geosite.db geosite-lite.db - name: Build geosite.db file env: @@ -264,7 +254,7 @@ jobs: 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 > geositelite.dat.sha256sum + sha256sum geosite-lite.dat > geosite-lite.dat.sha256sum - name: Delete current release assets From 9f748a44d7e0dbeefa19e85d3f61a34881750493 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 15:37:01 +0800 Subject: [PATCH 4/7] Update run.yml --- .github/workflows/run.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index cc4ce9c3ac..e5a907cf5d 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -203,6 +203,16 @@ jobs: repository: SagerNet/sing-geosite path: sing-geosite + - name: Build geosite-lite.db file + env: + NO_SKIP: true + run: | + cd sing-geosite || exit 1 + sed -i 's/geosite-v2fly\.db/geosite.db/g' main.go + sed -i 's/v2fly\/domain-list-community/xishang0128\/meta-rules-dat/g' main.go + sed -i 's/dlc/geosite/g' main.go + go run -v . + mv geosite.db geosite-lite.db - name: Build geosite.db file env: From f6b806c244e9fa0334af41e34fac0b956fbd4c2e 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 15:42:16 +0800 Subject: [PATCH 5/7] Update run.yml --- .github/workflows/run.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index e5a907cf5d..a9eb105a2d 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -208,11 +208,10 @@ jobs: NO_SKIP: true run: | cd sing-geosite || exit 1 - sed -i 's/geosite-v2fly\.db/geosite.db/g' main.go + 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/g' main.go + sed -i 's/dlc/geosite-lite/g' main.go go run -v . - mv geosite.db geosite-lite.db - name: Build geosite.db file env: From 4fba10525ec4809ea33391f5685347d077b0f335 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 15:44:22 +0800 Subject: [PATCH 6/7] Update run.yml --- .github/workflows/run.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index a9eb105a2d..92cf633adc 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -218,7 +218,6 @@ jobs: NO_SKIP: true run: | cd sing-geosite || exit 1 - sed -i 's/geosite-v2fly\.db/geosite.db/g' main.go sed -i 's/v2fly\/domain-list-community/xishang0128\/meta-rules-dat/g' main.go sed -i 's/dlc/geosite/g' main.go go run -v . From 367fff527370a1a8a5a50a7dfe6deaba616a8d69 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 15:46:47 +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 92cf633adc..f3da296ed4 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -218,8 +218,8 @@ jobs: NO_SKIP: true run: | cd sing-geosite || exit 1 - sed -i 's/v2fly\/domain-list-community/xishang0128\/meta-rules-dat/g' main.go - sed -i 's/dlc/geosite/g' main.go + sed -i 's/geosite-lite\.db/geosite.db/g' main.go + sed -i 's/geosite-lite/geosite/g' main.go go run -v . - name: Checkout SagerNet/sing-geoip