From fed39d5c4c1315e8833aacf2131b65da2face8d1 Mon Sep 17 00:00:00 2001 From: georgekart <79908923+georgekart@users.noreply.github.com> Date: Wed, 11 Sep 2024 20:47:32 +0400 Subject: [PATCH] Update run.yml --- .github/workflows/run.yml | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index 23700b757bb..11709977c16 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -155,8 +155,7 @@ jobs: cp ./community/data/category-ads-all reject-list.txt - name: Create `china-list`、`google-cn`、`apple-cn`、`gfw`、`category-ir-half-price`、`blocked-by-taiwan` lists - env: - CENSORED_LIST: ${{ secrets.FATI_CENSOR_DOMAIN }} + run: | curl -sSL $CHINA_DOMAINS_URL | perl -ne '/^server=\/([^\/]+)\// && print "$1\n"' > ./community/data/china-list curl -sSL $CHINA_DOMAINS_URL | perl -ne '/^server=\/([^\/]+)\// && print "$1\n"' > china-list.txt @@ -176,12 +175,12 @@ jobs: curl -sSL $BLOCKED_BY_TAIWAN >> ./community/data/blocked-by-taiwan cat ./community/data/blocked-by-taiwan >> blocked-by-taiwan.txt curl -sSL $BLOCKED_BY_RUSSIA >> ./community/data/blocked-by-russia - curl -sSL ${CENSORED_LIST} >> ./community/data/faticensor - - name: Build geosite.dat file and export FATIcensor + + - name: Build geosite.dat file run: | cd custom || exit 1 - go run ./ --datapath=../community/data --exportlists=faticensor + go run ./ --datapath=../community/data - name: Move and zip files and generate sha256 hash run: | @@ -205,9 +204,6 @@ jobs: file_glob: true file: ./publish/* - - name: Move FATIcensor to publish folder - run: | - install -p ./custom/publish/faticensor.txt ./publish/ - name: Git push assets to "release" branch run: | @@ -236,11 +232,7 @@ jobs: sed -i 's/--outputdir/--outputpath/g' GenerateAndConvert.py python3 GenerateAndConvert.py ../community/data ./AdGuard_Rule - - name: Modify the head of FATIcensor - run: | - cd custom/AdGuard_Rule || exit 1 - sed -i 's/Source: https:\/\/github.com\/v2fly\/domain-list-community\/blob\/master\/data\/faticensor/It is the censorship list of Full Access To Internet./g' faticensor.txt - + - name: Git push assets to "AdGuard" branch run: | cd custom/AdGuard_Rule || exit 1 @@ -261,11 +253,7 @@ jobs: mkdir clash_Rule_Set sed -i 's/--outputdir/--outputpath/g' GenerateAndConvertForClash.py python3 GenerateAndConvertForClash.py ../community/data ./clash_Rule_Set - - name: Modify the head of FATIcensor - run: | - cd custom/clash_Rule_Set || exit 1 - sed -i 's/Source: https:\/\/github.com\/v2fly\/domain-list-community\/blob\/master\/data\/faticensor/It is the censorship list of Full Access To Internet./g' faticensor.yaml - + - name: Git push assets to "clash" branch run: | cd custom/clash_Rule_Set || exit 1