Compare commits

...

3 Commits

Author SHA1 Message Date
loyalsoldier
cc7852a932 Change go get flag to avoid upstream dependencies building errors 2020-08-03 12:54:35 +08:00
Loyalsoldier
b55e79edda Build after changing GitHub workflows 2020-08-03 12:50:57 +08:00
Loyalsoldier
1e2773eda5 Add EasyList & EsayListChina into reject-list 2020-08-03 12:50:56 +08:00

View File

@@ -7,7 +7,6 @@ on:
- master
- hidden
paths-ignore:
- ".github/**"
- "**/README.md"
jobs:
build:
@@ -39,6 +38,7 @@ jobs:
echo "::set-env name=LHIE1_RULES_PROXY_URL::https://raw.githubusercontent.com/lhie1/Rules/master/Surge/Surge%203/Provider/Proxy.list"
echo "::set-env name=LHIE1_RULES_REJECT_URL::https://raw.githubusercontent.com/lhie1/Rules/master/Surge/Surge%203/Provider/Reject.list"
echo "::set-env name=ADAWAY_REJECT_URL::https://raw.githubusercontent.com/AdAway/adaway.github.io/master/hosts.txt"
echo "::set-env name=EASYLISTCHINA_EASYLIST_REJECT_URL::https://easylist-downloads.adblockplus.org/easylistchina+easylist.txt"
echo "::set-env name=GOPATH::$(dirname $GITHUB_WORKSPACE)"
echo "::add-path::$(dirname $GITHUB_WORKSPACE)/bin"
shell: bash
@@ -57,12 +57,12 @@ jobs:
- name: Generate geoip.dat file
run: |
go get -u -v -insecure $GEOIP_REPO
go get -v -insecure $GEOIP_REPO
geoip --country=./geoip/GeoLite2-Country-Locations-en.csv --ipv4=./geoip/GeoLite2-Country-Blocks-IPv4.csv --ipv6=./geoip/GeoLite2-Country-Blocks-IPv6.csv --ipv4CN=https://raw.githubusercontent.com/pexcn/daily/gh-pages/chnroute/chnroute.txt
- name: Download geosite project
run: |
go get -u -v -insecure $GEOSITE_REPO
go get -v -insecure $GEOSITE_REPO
- name: Get and add direct domains into temp-direct.txt file
run: |
@@ -86,6 +86,7 @@ jobs:
curl -sSL $GEQ1AN_RULES_REJECT_URL | awk -F ',' '/^(HOST|DOMAIN)(,|\-SUFFIX,).+AdBlock/ {print $2}' > temp-reject.txt
curl -sSL $LHIE1_RULES_REJECT_URL | awk -F ',' '/^DOMAIN(,|\-SUFFIX,).+/ {print $2}' >> temp-reject.txt
curl -sSL $ADAWAY_REJECT_URL | grep "127.0.0.1" | sed '1d' | awk '{print $2}' >> temp-reject.txt
curl -sSL $EASYLISTCHINA_EASYLIST_REJECT_URL | perl -ne '/^\|\|([-_0-9a-zA-Z]+(\.[-_0-9a-zA-Z]+){1,64})\^($|\$third-party$)/ && print "$1\n"' | perl -ne 'print if not /^[0-9]{1,3}(\.[0-9]{1,3}){3}$/' >> temp-reject.txt
- name: Add proxy, direct and reject domains from "hidden" branch to appropriate temp files
run: |