up

boluomimohesa · Nov 6, 2023 · 6e21d95 · 6e21d95
1 parent 3eaa61a
commit 6e21d95
Showing 1 changed file with 21 additions and 1 deletion.
diff --git a/.github/workflows/ToDomain.yml b/.github/workflows/ToDomain.yml
@@ -27,13 +27,20 @@ jobs:
           echo "facebookUrl=https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/rule/Clash/Facebook/Facebook.yaml" >> $GITHUB_ENV
           echo "twitterUrl=https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/rule/Clash/Twitter/Twitter.yaml" >> $GITHUB_ENV
           echo "bingUrl=https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/rule/Clash/Bing/Bing.yaml" >> $GITHUB_ENV
+          echo "proxyUrl=https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/rule/Clash/Proxy/Proxy.list" >> $GITHUB_ENV
         shell: bash
 
       - name: Checkout v2fly/domain-list-community
         uses: actions/checkout@v4
         with:
           repository: v2fly/domain-list-community
           path: community
+
+      - name: Checkout cokebar/gfwlist2dnsmasq
+        uses: actions/checkout@v4
+        with:
+          repository: cokebar/gfwlist2dnsmasq
+          path: gfwlist2dnsmasq
 
       - name: Setup Go
         uses: actions/setup-go@v4
@@ -43,7 +50,7 @@ jobs:
 
       - name: To Domain file
         env:
-          filterDomain: grep -E "^(  - DOMAIN,|  - DOMAIN-SUFFIX,)" | sed "s/^  - DOMAIN,//g"  | sed "s/^  - DOMAIN-SUFFIX,/\+\./"
+          filterDomain: grep -E "^(  - DOMAIN,|  - DOMAIN-SUFFIX,)" | sed "s/^  - DOMAIN,//g"  | sed "s/^  - DOMAIN-SUFFIX,/+./g"
         run: |
           mkdir -p publish
           cd publish || exit 1
@@ -68,6 +75,19 @@ jobs:
           cd data-list || exit 1
           cat category-dev.txt | ${{ env.filterDomain }} > ../publish/category-dev.txt
 
+      - name: Merge Proxy
+        env:
+          filterList: grep -E "^(DOMAIN,|DOMAIN-SUFFIX)" | sed "s/^DOMAIN,//g" | sed "s/^DOMAIN-SUFFIX,/+./g"
+        run: |
+          cd gfwlist2dnsmasq || exit 1
+          chmod +x ./gfwlist2dnsmasq.sh
+          ./gfwlist2dnsmasq.sh -l -o gfwlist.txt
+          cd ../
+          mkdir -p merge
+          cd merge || exit 1
+          curl -sSL ${proxyUrl} | ${{ env.filterList }} > proxy.txt
+          cat proxy.txt gfwlist.txt | sort | uniq > ../publish/proxy.txt
+
       - name: Merge Openai
         env:
           filterDomain: grep -E "^(  - DOMAIN,|  - DOMAIN-SUFFIX,)" | sed "s/^  - DOMAIN,//g"  | sed "s/^  - DOMAIN-SUFFIX,/\+\./"