diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index c0961eeb..220dab14 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -224,47 +224,56 @@ jobs: NO_SKIP: true run: | mkdir -p ./sing-rule/geo - cp ./geoip.dat ./geosite.db ./resouces/convert.sh ./sing-rule/geo/ + cp ./geoip.dat ./custom/publish/geosite.dat ./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 geosite && mkdir -p geoip + wget https://github.com/xishang0128/convert/releases/download/Prerelease-main/convert-linux-amd64 + chmod 755 convert-linux-amd64 + ./convert-linux-amd64 geosite -f ./geosite.dat -o ./geosite -t sing-box + ./convert-linux-amd64 geoip -f ./geoip.dat -o ./geoip -t sing-box + rm convert-linux-amd64 geoip.dat geosite.dat - 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/ + cp ./geoip-lite.dat ./sing-rule/geo-lite/geoip.dat && cp ./community/geosite-lite.dat ./sing-rule/geo-lite/geosite.dat 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 geosite && mkdir -p geoip + wget https://github.com/xishang0128/convert/releases/download/Prerelease-main/convert-linux-amd64 + chmod 755 convert-linux-amd64 + ./convert-linux-amd64 geosite -f ./geosite.dat -o ./geosite -t sing-box + ./convert-linux-amd64 geoip -f ./geoip.dat -o ./geoip -t sing-box + rm convert-linux-amd64 geoip.dat geosite.dat - 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/ + cp ./geoip.dat ./custom/publish/geosite.dat ./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 geosite/classical && mkdir -p geoip/classical + wget https://github.com/xishang0128/convert/releases/download/Prerelease-main/convert-linux-amd64 + chmod 755 convert-linux-amd64 + ./convert-linux-amd64 geosite -f ./geosite.dat -o ./geosite + ./convert-linux-amd64 geoip -f ./geoip.dat -o ./geoip + rm convert-linux-amd64 geoip.dat geosite.dat - 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/ + cp ./geoip-lite.dat ./meta-rule/geo-lite/geoip.dat && cp ./community/geosite-lite.dat ./meta-rule/geo-lite/geosite.dat 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 geosite/classical && mkdir -p geoip/classical + wget https://github.com/xishang0128/convert/releases/download/Prerelease-main/convert-linux-amd64 + chmod 755 convert-linux-amd64 + ./convert-linux-amd64 geosite -f ./geosite.dat -o ./geosite + ./convert-linux-amd64 geoip -f ./geoip.dat -o ./geoip + rm convert-linux-amd64 geoip.dat geosite.dat # - name: Convert bm7-rule-set to sing-rule-set # env: @@ -340,7 +349,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" @@ -353,7 +361,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"