diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 39c43b7..402adea 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,12 +24,12 @@ jobs: echo "::set-env name=TAG_NAME::$(date +%Y%m%d%H%M)" echo "::set-env name=GEOIP_REPO::github.com/v2ray/geoip" echo "::set-env name=GEOSITE_REPO::github.com/v2ray/domain-list-community" - echo "::set-env name=GOOGLE_URL::https://raw.githubusercontent.com/felixonmars/dnsmasq-china-list/master/google.china.conf" - echo "::set-env name=APPLE_URL::https://raw.githubusercontent.com/felixonmars/dnsmasq-china-list/master/apple.china.conf" - echo "::set-env name=GFWLIST_URL::https://cokebar.github.io/gfwlist2dnsmasq/gfwlist_domain.txt" - echo "::set-env name=Blocked_DOMAINS_URL::https://raw.githubusercontent.com/wongsyrone/domain-block-list/master/domains.txt" + echo "::set-env name=GOOGLE_DOMAINS_URL::https://raw.githubusercontent.com/felixonmars/dnsmasq-china-list/master/google.china.conf" + echo "::set-env name=APPLE_DOMAINS_URL::https://raw.githubusercontent.com/felixonmars/dnsmasq-china-list/master/apple.china.conf" + echo "::set-env name=GFWLIST_DOMAINS_URL::https://cokebar.github.io/gfwlist2dnsmasq/gfwlist_domain.txt" + 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=PROFILES_URL::https://raw.githubusercontent.com/ConnersHua/Profiles/master/Shadow/Pro.conf" echo "::set-env name=GOPATH::$(dirname $GITHUB_WORKSPACE)" echo "::add-path::$(dirname $GITHUB_WORKSPACE)/bin" shell: bash @@ -59,27 +59,27 @@ jobs: - name: Get and add gfwlist domains into temp-proxy.txt file run: | - curl -sSL $GFWLIST_URL > temp-proxy.txt + curl -sSL $GFWLIST_DOMAINS_URL > temp-proxy.txt - name: Get and add google domains into temp-proxy.txt file run: | - curl -sSL $GOOGLE_URL | awk -F '/' '{print $2}' >> temp-proxy.txt + curl -sSL $GOOGLE_DOMAINS_URL | awk -F '/' '{print $2}' >> temp-proxy.txt - name: Get and add apple domains into temp-proxy.txt file run: | - curl -sSL $APPLE_URL | awk -F '/' '{print $2}' >> temp-proxy.txt + curl -sSL $APPLE_DOMAINS_URL | awk -F '/' '{print $2}' >> temp-proxy.txt - name: Get and add proxy domains from @ConnersHua/Profiles into temp-proxy.txt file run: | - curl -sSL $Profiles_URL | awk -F ',' '/^DOMAIN(,|\-SUFFIX,).+PROXY/ {print $2}' >> temp-proxy.txt + curl -sSL $PROFILES_URL | awk -F ',' '/^DOMAIN(,|\-SUFFIX,).+PROXY/ {print $2}' >> temp-proxy.txt - name: Get and add blocked domains from @wongsyrone/domain-block-list into temp-proxy.txt file run: | - curl -sSL $Blocked_DOMAINS_URL >> temp-proxy.txt + curl -sSL $GREATFIRE_DOMAINS_URL >> temp-proxy.txt - name: Get and add direct domains from @ConnersHua/Profiles into temp-direct.txt file run: | - curl -sSL $Profiles_URL | awk -F ',' '/^DOMAIN(,|\-SUFFIX,).+DIRECT/ {print $2}' > temp-direct.txt + curl -sSL $PROFILES_URL | awk -F ',' '/^DOMAIN(,|\-SUFFIX,).+DIRECT/ {print $2}' > temp-direct.txt - name: Get and add chinalist domains into temp-direct.txt file run: | @@ -88,7 +88,7 @@ jobs: - name: Get and add rejected domains from @ConnersHua/Profiles into category-ads-all run: | cd $GOPATH/src/$GEOSITE_REPO/data - curl -sSL $Profiles_URL | awk -F ',' '/^DOMAIN(,|\-SUFFIX,).+REJECT/ {print $2}' > profilereject + 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