From a40be9c96c74b7ef880f5116b2ee3999506cd153 Mon Sep 17 00:00:00 2001 From: Larvan2 <78135608+Larvan2@users.noreply.github.com> Date: Tue, 11 Apr 2023 06:53:09 +0000 Subject: [PATCH] update --- .github/workflows/run.yml | 42 +++++++++------------------------------ 1 file changed, 9 insertions(+), 33 deletions(-) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index 37edf85c32..69d7bf9664 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -164,29 +164,20 @@ jobs: - name: Add `meta` data env: - SED: sed '/^\s*#/d' | sed 's/^PROCESS-NAME,//' | sed 's/DOMAIN,/full:/g' | sed 's/DOMAIN-SUFFIX,//g' | sed 's/DOMAIN-KEYWORD,/keyword:/g' + SED: sed '/^\s*#/d' | sed 's/^PROCESS-NAME,//' | sed 's/DOMAIN,/full:/g' | sed 's/DOMAIN-SUFFIX,//g' | sed 's/DOMAIN-KEYWORD,/keyword:/g' | sed '/^\s*IP-CIDR/d' run: | curl -sSL https://raw.githubusercontent.com/xishang0128/rules/main/biliintl.list > ./community/data/biliintl curl -sSL https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/rule/Clash/OneDrive/OneDrive.list | ${{ env.SED }} > ./community/data/onedrive - echo "sharepoint.cn" >> ./community/data/onedrive && sort ./community/data/onedrive | uniq -i > tmp.txt && mv tmp.txt ./community/data/onedrive + echo "sharepoint.cn" >> ./community/data/onedrive curl -sSL https://raw.githubusercontent.com/xishang0128/rules/main/sharepoint.list > ./community/data/sharepoint - curl -sSL https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/rule/Clash/PrivateTracker/PrivateTracker.list | ${{ env.SED }} > ./community/data/tracker1 - curl -sSL https://gitea.com/XIU2/TrackersListCollection/raw/branch/master/all.txt | grep -i "\.[A-Z]" | grep -v tracker | sed 's/^.*\/\///g' | sed 's/:.*\/.*//g' >> ./community/data/tracker1 - sort ./community/data/tracker1 | uniq -i > ./community/data/tracker - rm ./community/data/tracker1 - + curl -sSL https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/rule/Clash/PrivateTracker/PrivateTracker.list | ${{ env.SED }} > ./community/data/tracker + curl -sSL https://gitea.com/XIU2/TrackersListCollection/raw/branch/master/all.txt | grep -i "\.[A-Z]" | grep -v tracker | sed 's/^.*\/\///g' | sed 's/:.*\/.*//g' >> ./community/data/tracker + - name: Build geosite.dat file run: | cd custom || exit 1 go run ./ --datapath=../community/data - - - - - - - - name: Build geosite-lite.dat file env: NO_SKIP: true @@ -206,14 +197,14 @@ jobs: curl -sSL https://github.com/blackmatrix7/ios_rule_script/raw/master/rule/Clash/Google/Google.yaml | ${{ env.SED }} > ./data-lite/google curl -sSL https://github.com/blackmatrix7/ios_rule_script/raw/master/rule/Clash/GitHub/GitHub.yaml | ${{ env.SED }} > ./data-lite/github - + curl -sSL https://github.com/blackmatrix7/ios_rule_script/raw/master/rule/Clash/Microsoft/Microsoft.yaml | ${{ env.SED }} > ./data-lite/microsoft - + curl -sSL https://github.com/blackmatrix7/ios_rule_script/raw/master/rule/Clash/Netflix/Netflix.yaml | ${{ env.SED }} > ./data-lite/netflix - + curl -sSL https://github.com/blackmatrix7/ios_rule_script/raw/master/rule/Clash/OpenAI/OpenAI.yaml | ${{ env.SED }} > ./data-lite/openai curl -sSL https://github.com/blackmatrix7/ios_rule_script/raw/master/rule/Clash/OneDrive/OneDrive.yaml | ${{ env.SED }} > ./data-lite/onedrive - + curl -sSL https://github.com/blackmatrix7/ios_rule_script/raw/master/rule/Clash/Pixiv/Pixiv.yaml | ${{ env.SED }} > ./data-lite/pixiv curl -sSL https://github.com/blackmatrix7/ios_rule_script/raw/master/rule/Clash/Telegram/Telegram.yaml | ${{ env.SED }} > ./data-lite/telegram @@ -224,13 +215,6 @@ jobs: go run ./ --datapath=./data-lite --outputname geosite-lite.dat - - - - - - - - name: Get geoip.dat relative files run: | wget -O geoip-lite.dat https://github.com/xishang0128/geoip/raw/release/geoip.dat @@ -249,12 +233,6 @@ jobs: ./v2box migrate geoip -i ../geoip.dat -o ./geoip.db ./v2box migrate geoip -i ../geoip-lite.dat -o ./geoip-lite.db - - - - - - - name: Move and zip files run: | mkdir -p ./publish/ @@ -273,7 +251,6 @@ 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 - - name: Delete current release assets uses: andreaswilli/delete-release-assets-action@v2.0.0 with: @@ -281,7 +258,6 @@ jobs: tag: latest deleteOnlyFromDrafts: false - - name: Release and upload assets uses: softprops/action-gh-release@v0.1.6 with: