diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8647279..402adea 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,7 +30,6 @@ jobs: echo "::set-env name=GREATFIRE_DOMAINS_URL::https://raw.githubusercontent.com/wongsyrone/domain-block-list/master/domains.txt" echo "::set-env name=CHINA_DOMAINS_URL::https://raw.githubusercontent.com/felixonmars/dnsmasq-china-list/master/accelerated-domains.china.conf" echo "::set-env name=PROFILES_URL::https://raw.githubusercontent.com/ConnersHua/Profiles/master/Shadow/Pro.conf" - echo "::set-env name=FAKENEWS_GAMBLING_DOMAINS_URL::https://raw.githubusercontent.com/StevenBlack/hosts/master/alternates/fakenews-gambling/hosts" echo "::set-env name=GOPATH::$(dirname $GITHUB_WORKSPACE)" echo "::add-path::$(dirname $GITHUB_WORKSPACE)/bin" shell: bash @@ -86,13 +85,11 @@ jobs: run: | curl -sSL $CHINA_DOMAINS_URL | awk -F '/' '{print $2}' >> temp-direct.txt - - name: Get and add rejected domains from @ConnersHua/Profiles into temp-reject.txt file + - name: Get and add rejected domains from @ConnersHua/Profiles into category-ads-all run: | - curl -sSL $PROFILES_URL | awk -F ',' '/^DOMAIN(,|\-SUFFIX,).+REJECT/ {print $2}' > temp-reject.txt - - - name: Get and add fakenews+gambling rejected domains from @StevenBlack/hosts into temp-reject.txt file - run: | - curl -sSL $FAKENEWS_GAMBLING_DOMAINS_URL | awk '/^0\.0\.0\.0 /{print $2}' | awk '!/^0\.0\.0\.0/{print $0}' >> temp-reject.txt + cd $GOPATH/src/$GEOSITE_REPO/data + curl -sSL $PROFILES_URL | awk -F ',' '/^DOMAIN(,|\-SUFFIX,).+REJECT/ {print $2}' > profilereject + echo "include:profilereject" >> category-ads-all - name: Add proxy and direct domains from the branch named hidden of this repo to appropriate temp files run: | @@ -103,14 +100,12 @@ jobs: run: | cat temp-proxy.txt | sort --ignore-case -u > $GOPATH/src/$GEOSITE_REPO/data/proxylist cat temp-direct.txt | sort --ignore-case -u > $GOPATH/src/$GEOSITE_REPO/data/directlist - cat temp-reject.txt | sort --ignore-case -u > $GOPATH/src/$GEOSITE_REPO/data/rejectlist - name: Add lists into appropriate category run: | cd $GOPATH/src/$GEOSITE_REPO/data echo "include:proxylist" >> geolocation-\!cn echo "include:directlist" >> cn - echo "include:rejectlist" >> category-ads-all - name: Build geosite.dat file run: |