From 07ea92c880e5d1a4d685228e6bff7f7b3e79e989 Mon Sep 17 00:00:00 2001
From: xishang0128 <xishang02@gmail.com>
Date: Tue, 30 Jul 2024 08:08:47 +0800
Subject: [PATCH] update

---
 .github/workflows/run.yml | 58 +++++++++++++++------------------------
 1 file changed, 22 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml
index 7b24311e..577de730 100644
--- a/.github/workflows/run.yml
+++ b/.github/workflows/run.yml
@@ -43,6 +43,12 @@ jobs:
           repository: v2fly/domain-list-community
           path: community
 
+      - name: Checkout xishang0128/convert
+        uses: actions/checkout@v4
+        with:
+          repository: xishang0128/convert
+          path: convert
+
       - name: Checkout cokebar/gfwlist2dnsmasq
         uses: actions/checkout@v4
         with:
@@ -223,57 +229,37 @@ jobs:
         env:
           NO_SKIP: true
         run: |
-          mkdir -p ./sing-rule/geo
-          cp ./geoip.dat ./custom/publish/geosite.dat ./sing-rule/geo/ 
-          cd ./sing-rule/geo
-          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
+          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/geosite -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 ./community/geosite-lite.dat ./sing-rule/geo-lite/geosite.dat 
-          cd ./sing-rule/geo-lite
-          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
+          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 ./meta-rule/geo/ 
-          cd ./meta-rule/geo
-          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
+          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
-          cd ./meta-rule/geo-lite
-          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
+          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 bm7-rule-set to sing-rule-set
       #   env: