mirror of
https://github.com/Loyalsoldier/v2ray-rules-dat.git
synced 2024-11-10 02:55:34 +08:00
Refine workflow
This commit is contained in:
parent
bca4f6aad8
commit
7b7796af37
87
.github/workflows/build.yml
vendored
87
.github/workflows/build.yml
vendored
@ -5,25 +5,21 @@ on:
|
|||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- master
|
- master
|
||||||
- hidden
|
|
||||||
paths-ignore:
|
paths-ignore:
|
||||||
- "**/README.md"
|
- "**/README.md"
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
name: Build
|
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Setup Go 1.x
|
- name: Setup Go 1.x.y
|
||||||
uses: actions/setup-go@v2
|
uses: actions/setup-go@v2
|
||||||
with:
|
with:
|
||||||
go-version: "^1.14"
|
go-version: "^1.15"
|
||||||
|
|
||||||
- name: Set $GOPATH and more variables
|
- name: Set variables
|
||||||
run: |
|
run: |
|
||||||
echo "RELEASE_NAME=Released on $(date +%Y%m%d%H%M)" >> $GITHUB_ENV
|
echo "RELEASE_NAME=Released on $(date +%Y%m%d%H%M)" >> $GITHUB_ENV
|
||||||
echo "TAG_NAME=$(date +%Y%m%d%H%M)" >> $GITHUB_ENV
|
echo "TAG_NAME=$(date +%Y%m%d%H%M)" >> $GITHUB_ENV
|
||||||
echo "GEOIP_REPO=github.com/Loyalsoldier/geoip" >> $GITHUB_ENV
|
|
||||||
echo "GEOSITE_REPO=github.com/v2fly/domain-list-community" >> $GITHUB_ENV
|
|
||||||
echo "CHINA_DOMAINS_URL=https://raw.githubusercontent.com/felixonmars/dnsmasq-china-list/master/accelerated-domains.china.conf" >> $GITHUB_ENV
|
echo "CHINA_DOMAINS_URL=https://raw.githubusercontent.com/felixonmars/dnsmasq-china-list/master/accelerated-domains.china.conf" >> $GITHUB_ENV
|
||||||
echo "GOOGLE_DOMAINS_URL=https://raw.githubusercontent.com/felixonmars/dnsmasq-china-list/master/google.china.conf" >> $GITHUB_ENV
|
echo "GOOGLE_DOMAINS_URL=https://raw.githubusercontent.com/felixonmars/dnsmasq-china-list/master/google.china.conf" >> $GITHUB_ENV
|
||||||
echo "APPLE_DOMAINS_URL=https://raw.githubusercontent.com/felixonmars/dnsmasq-china-list/master/apple.china.conf" >> $GITHUB_ENV
|
echo "APPLE_DOMAINS_URL=https://raw.githubusercontent.com/felixonmars/dnsmasq-china-list/master/apple.china.conf" >> $GITHUB_ENV
|
||||||
@ -36,17 +32,33 @@ jobs:
|
|||||||
echo "PETERLOWE_REJECT_URL=https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=1&mimetype=plaintext" >> $GITHUB_ENV
|
echo "PETERLOWE_REJECT_URL=https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=1&mimetype=plaintext" >> $GITHUB_ENV
|
||||||
echo "ADGUARD_DNS_REJECT_URL=https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt" >> $GITHUB_ENV
|
echo "ADGUARD_DNS_REJECT_URL=https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt" >> $GITHUB_ENV
|
||||||
echo "DANPOLLOCK_REJECT_URL=https://someonewhocares.org/hosts/hosts" >> $GITHUB_ENV
|
echo "DANPOLLOCK_REJECT_URL=https://someonewhocares.org/hosts/hosts" >> $GITHUB_ENV
|
||||||
echo "V2FLY_DIRECT=https://raw.githubusercontent.com/v2fly/domain-list-community/release/cn.txt" >> $GITHUB_ENV
|
echo "CUSTOM_DIRECT=https://raw.githubusercontent.com/Loyalsoldier/domain-list-custom/release/cn.txt" >> $GITHUB_ENV
|
||||||
echo "V2FLY_PROXY=https://raw.githubusercontent.com/v2fly/domain-list-community/release/geolocation-!cn.txt" >> $GITHUB_ENV
|
echo "CUSTOM_PROXY=https://raw.githubusercontent.com/Loyalsoldier/domain-list-custom/release/geolocation-!cn.txt" >> $GITHUB_ENV
|
||||||
echo "GOPATH=$(dirname $GITHUB_WORKSPACE)" >> $GITHUB_ENV
|
|
||||||
echo "$(dirname $GITHUB_WORKSPACE)/bin" >> $GITHUB_PATH
|
|
||||||
shell: bash
|
shell: bash
|
||||||
|
|
||||||
- name: Checkout the "hidden" branch
|
- name: Checkout the "hidden" branch of this repo
|
||||||
uses: actions/checkout@v2.3.3
|
uses: actions/checkout@v2.3.3
|
||||||
with:
|
with:
|
||||||
ref: hidden
|
ref: hidden
|
||||||
|
|
||||||
|
- name: Checkout Loyalsoldier/geoip
|
||||||
|
uses: actions/checkout@v2.3.3
|
||||||
|
with:
|
||||||
|
repository: Loyalsoldier/geoip
|
||||||
|
path: geoip
|
||||||
|
|
||||||
|
- name: Checkout Loyalsoldier/domain-list-custom
|
||||||
|
uses: actions/checkout@v2.3.3
|
||||||
|
with:
|
||||||
|
repository: Loyalsoldier/domain-list-custom
|
||||||
|
path: custom
|
||||||
|
|
||||||
|
- name: Checkout v2fly/domain-list-community
|
||||||
|
uses: actions/checkout@v2.3.3
|
||||||
|
with:
|
||||||
|
repository: v2fly/domain-list-community
|
||||||
|
path: community
|
||||||
|
|
||||||
- name: Get GeoLite2 zip file
|
- name: Get GeoLite2 zip file
|
||||||
env:
|
env:
|
||||||
LICENSE_KEY: ${{ secrets.MAXMIND_GEOLITE2_LICENSE }}
|
LICENSE_KEY: ${{ secrets.MAXMIND_GEOLITE2_LICENSE }}
|
||||||
@ -54,21 +66,17 @@ jobs:
|
|||||||
curl -L -o GeoLite2-Country-CSV.zip "https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-Country-CSV&license_key=${LICENSE_KEY}&suffix=zip"
|
curl -L -o GeoLite2-Country-CSV.zip "https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-Country-CSV&license_key=${LICENSE_KEY}&suffix=zip"
|
||||||
unzip GeoLite2-Country-CSV.zip
|
unzip GeoLite2-Country-CSV.zip
|
||||||
rm -f GeoLite2-Country-CSV.zip
|
rm -f GeoLite2-Country-CSV.zip
|
||||||
mv GeoLite2* geoip
|
mv GeoLite2* geolite2
|
||||||
|
|
||||||
- name: Generate geoip.dat file
|
- name: Generate geoip.dat file
|
||||||
run: |
|
run: |
|
||||||
go get -v -insecure $GEOIP_REPO
|
cd geoip || exit 1
|
||||||
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
|
go run ./ --country=../geolite2/GeoLite2-Country-Locations-en.csv --ipv4=../geolite2/GeoLite2-Country-Blocks-IPv4.csv --ipv6=../geolite2/GeoLite2-Country-Blocks-IPv6.csv --ipv4CN=https://raw.githubusercontent.com/pexcn/daily/gh-pages/chnroute/chnroute.txt
|
||||||
|
|
||||||
- name: Download geosite project
|
|
||||||
run: |
|
|
||||||
go get -v -insecure $GEOSITE_REPO
|
|
||||||
|
|
||||||
- name: Get and add direct domains into temp-direct.txt file
|
- name: Get and add direct domains into temp-direct.txt file
|
||||||
run: |
|
run: |
|
||||||
curl -sSL $CHINA_DOMAINS_URL | perl -ne '/^server=\/([^\/]+)\// && print "$1\n"' > temp-direct.txt
|
curl -sSL $CHINA_DOMAINS_URL | perl -ne '/^server=\/([^\/]+)\// && print "$1\n"' > temp-direct.txt
|
||||||
curl -sSL ${V2FLY_DIRECT} | perl -ne '/^(domain|full):([^:]+)(\n$|:@.+)/ && print "$2\n"' >> temp-direct.txt
|
curl -sSL ${CUSTOM_DIRECT} | perl -ne '/^(domain|full):([^:]+)(\n$|:@.+)/ && print "$2\n"' >> temp-direct.txt
|
||||||
|
|
||||||
- name: Get and add proxy domains into temp-proxy.txt file
|
- name: Get and add proxy domains into temp-proxy.txt file
|
||||||
run: |
|
run: |
|
||||||
@ -79,7 +87,7 @@ jobs:
|
|||||||
curl -sSL $APPLE_DOMAINS_URL | perl -ne '/^server=\/([^\/]+)\// && print "$1\n"' >> temp-proxy.txt
|
curl -sSL $APPLE_DOMAINS_URL | perl -ne '/^server=\/([^\/]+)\// && print "$1\n"' >> temp-proxy.txt
|
||||||
curl -sSL $GEQ1AN_RULES_GLOBAL_MEDIA_URL | awk -F ',' '/^(HOST|DOMAIN)(,|\-SUFFIX,).+GMedia/ {print $2}' >> temp-proxy.txt
|
curl -sSL $GEQ1AN_RULES_GLOBAL_MEDIA_URL | awk -F ',' '/^(HOST|DOMAIN)(,|\-SUFFIX,).+GMedia/ {print $2}' >> temp-proxy.txt
|
||||||
curl -sSL $LHIE1_RULES_PROXY_URL | awk -F ',' '/^(HOST|DOMAIN)(,|\-SUFFIX,).+/ {print $2}' >> temp-proxy.txt
|
curl -sSL $LHIE1_RULES_PROXY_URL | awk -F ',' '/^(HOST|DOMAIN)(,|\-SUFFIX,).+/ {print $2}' >> temp-proxy.txt
|
||||||
curl -sSL ${V2FLY_PROXY} | grep -Ev ":@cn" | perl -ne '/^(domain|full):([^:]+)(\n$|:@.+)/ && print "$2\n"' >> temp-proxy.txt
|
curl -sSL ${CUSTOM_PROXY} | grep -Ev ":@cn" | perl -ne '/^(domain|full):([^:]+)(\n$|:@.+)/ && print "$2\n"' >> temp-proxy.txt
|
||||||
|
|
||||||
- name: Get and add reject domains into temp-reject.txt file
|
- name: Get and add reject domains into temp-reject.txt file
|
||||||
run: |
|
run: |
|
||||||
@ -88,10 +96,10 @@ jobs:
|
|||||||
curl -sSL $PETERLOWE_REJECT_URL | perl -ne '/^127\.0\.0\.1\s([-_0-9a-zA-Z]+(\.[-_0-9a-zA-Z]+){1,64})$/ && print "$1\n"' >> temp-reject.txt
|
curl -sSL $PETERLOWE_REJECT_URL | perl -ne '/^127\.0\.0\.1\s([-_0-9a-zA-Z]+(\.[-_0-9a-zA-Z]+){1,64})$/ && print "$1\n"' >> temp-reject.txt
|
||||||
curl -sSL $DANPOLLOCK_REJECT_URL | perl -ne '/^127\.0\.0\.1\s([-_0-9a-zA-Z]+(\.[-_0-9a-zA-Z]+){1,64})/ && print "$1\n"' | sed '1d' >> temp-reject.txt
|
curl -sSL $DANPOLLOCK_REJECT_URL | perl -ne '/^127\.0\.0\.1\s([-_0-9a-zA-Z]+(\.[-_0-9a-zA-Z]+){1,64})/ && print "$1\n"' | sed '1d' >> temp-reject.txt
|
||||||
|
|
||||||
- name: Reserve `regexp` and `keyword` type of rules from v2fly lists to "reserve" files
|
- name: Reserve `regexp` and `keyword` type of rules from custom lists to "reserve" files
|
||||||
run: |
|
run: |
|
||||||
curl -sSL ${V2FLY_DIRECT} | perl -ne '/^((regexp|keyword):[^:]+)(\n$|:@.+)/ && print "$1\n"' > direct-reserve.txt
|
curl -sSL ${CUSTOM_DIRECT} | perl -ne '/^((regexp|keyword):[^:]+)(\n$|:@.+)/ && print "$1\n"' > direct-reserve.txt
|
||||||
curl -sSL ${V2FLY_PROXY} | grep -Ev ":@cn" | perl -ne '/^((regexp|keyword):[^:]+)(\n$|:@.+)/ && print "$1\n"' > proxy-reserve.txt
|
curl -sSL ${CUSTOM_PROXY} | grep -Ev ":@cn" | perl -ne '/^((regexp|keyword):[^:]+)(\n$|:@.+)/ && print "$1\n"' > proxy-reserve.txt
|
||||||
|
|
||||||
- name: Add proxy, direct and reject domains from "hidden" branch to appropriate temp files
|
- name: Add proxy, direct and reject domains from "hidden" branch to appropriate temp files
|
||||||
run: |
|
run: |
|
||||||
@ -129,41 +137,42 @@ jobs:
|
|||||||
|
|
||||||
- name: Remove domains end with ".cn" in "temp-geolocation-!cn.txt" and write lists to data directory
|
- name: Remove domains end with ".cn" in "temp-geolocation-!cn.txt" and write lists to data directory
|
||||||
run: |
|
run: |
|
||||||
cat temp-cn.txt | sort --ignore-case -u | perl -ne '/^((?=^.{1,255})[a-zA-Z0-9][-_a-zA-Z0-9]{0,62}(\.[a-zA-Z0-9][-_a-zA-Z0-9]{0,62})*)/ && print "$1\n"' > $GOPATH/src/$GEOSITE_REPO/data/cn
|
cat temp-cn.txt | sort --ignore-case -u | perl -ne '/^((?=^.{1,255})[a-zA-Z0-9][-_a-zA-Z0-9]{0,62}(\.[a-zA-Z0-9][-_a-zA-Z0-9]{0,62})*)/ && print "$1\n"' > ./community/data/cn
|
||||||
cat temp-cn.txt | sort --ignore-case -u | perl -ne 'print if not /^((?=^.{3,255})[a-zA-Z0-9][-_a-zA-Z0-9]{0,62}(\.[a-zA-Z0-9][-_a-zA-Z0-9]{0,62})+)/' > direct-tld-list.txt
|
cat temp-cn.txt | sort --ignore-case -u | perl -ne 'print if not /^((?=^.{3,255})[a-zA-Z0-9][-_a-zA-Z0-9]{0,62}(\.[a-zA-Z0-9][-_a-zA-Z0-9]{0,62})+)/' > direct-tld-list.txt
|
||||||
cat temp-geolocation-\!cn.txt | sort --ignore-case -u | perl -ne '/^((?=^.{1,255})[a-zA-Z0-9][-_a-zA-Z0-9]{0,62}(\.[a-zA-Z0-9][-_a-zA-Z0-9]{0,62})*)/ && print "$1\n"' | perl -ne 'print if not /\.cn$/' > $GOPATH/src/$GEOSITE_REPO/data/geolocation-\!cn
|
cat temp-geolocation-\!cn.txt | sort --ignore-case -u | perl -ne '/^((?=^.{1,255})[a-zA-Z0-9][-_a-zA-Z0-9]{0,62}(\.[a-zA-Z0-9][-_a-zA-Z0-9]{0,62})*)/ && print "$1\n"' | perl -ne 'print if not /\.cn$/' > ./community/data/geolocation-\!cn
|
||||||
cat temp-geolocation-\!cn.txt | sort --ignore-case -u | perl -ne 'print if not /^((?=^.{3,255})[a-zA-Z0-9][-_a-zA-Z0-9]{0,62}(\.[a-zA-Z0-9][-_a-zA-Z0-9]{0,62})+)/' > proxy-tld-list.txt
|
cat temp-geolocation-\!cn.txt | sort --ignore-case -u | perl -ne 'print if not /^((?=^.{3,255})[a-zA-Z0-9][-_a-zA-Z0-9]{0,62}(\.[a-zA-Z0-9][-_a-zA-Z0-9]{0,62})+)/' > proxy-tld-list.txt
|
||||||
cat temp-category-ads-all.txt | sort --ignore-case -u | perl -ne '/^((?=^.{1,255})[a-zA-Z0-9][-_a-zA-Z0-9]{0,62}(\.[a-zA-Z0-9][-_a-zA-Z0-9]{0,62})*)/ && print "$1\n"' > $GOPATH/src/$GEOSITE_REPO/data/category-ads-all
|
cat temp-category-ads-all.txt | sort --ignore-case -u | perl -ne '/^((?=^.{1,255})[a-zA-Z0-9][-_a-zA-Z0-9]{0,62}(\.[a-zA-Z0-9][-_a-zA-Z0-9]{0,62})*)/ && print "$1\n"' > ./community/data/category-ads-all
|
||||||
cat temp-category-ads-all.txt | sort --ignore-case -u | perl -ne 'print if not /^((?=^.{3,255})[a-zA-Z0-9][-_a-zA-Z0-9]{0,62}(\.[a-zA-Z0-9][-_a-zA-Z0-9]{0,62})+)/' > reject-tld-list.txt
|
cat temp-category-ads-all.txt | sort --ignore-case -u | perl -ne 'print if not /^((?=^.{3,255})[a-zA-Z0-9][-_a-zA-Z0-9]{0,62}(\.[a-zA-Z0-9][-_a-zA-Z0-9]{0,62})+)/' > reject-tld-list.txt
|
||||||
|
|
||||||
- name: Add `regexp` and `keyword` type of rules back into "cn", "geolocation-!cn" and "category-ads-all" list
|
- name: Add `regexp` and `keyword` type of rules back into "cn", "geolocation-!cn" and "category-ads-all" list
|
||||||
run: |
|
run: |
|
||||||
[ -f "direct-reserve.txt" ] && cat direct-reserve.txt >> $GOPATH/src/$GEOSITE_REPO/data/cn
|
[ -f "direct-reserve.txt" ] && cat direct-reserve.txt >> ./community/data/cn
|
||||||
[ -f "proxy-reserve.txt" ] && cat proxy-reserve.txt >> $GOPATH/src/$GEOSITE_REPO/data/geolocation-\!cn
|
[ -f "proxy-reserve.txt" ] && cat proxy-reserve.txt >> ./community/data/geolocation-\!cn
|
||||||
[ -f "reject-reserve.txt" ] && cat reject-reserve.txt >> $GOPATH/src/$GEOSITE_REPO/data/category-ads-all
|
[ -f "reject-reserve.txt" ] && cat reject-reserve.txt >> ./community/data/category-ads-all
|
||||||
cp $GOPATH/src/$GEOSITE_REPO/data/cn direct-list.txt
|
cp ./community/data/cn direct-list.txt
|
||||||
cp $GOPATH/src/$GEOSITE_REPO/data/geolocation-\!cn proxy-list.txt
|
cp ./community/data/geolocation-\!cn proxy-list.txt
|
||||||
cp $GOPATH/src/$GEOSITE_REPO/data/category-ads-all reject-list.txt
|
cp ./community/data/category-ads-all reject-list.txt
|
||||||
|
|
||||||
- name: Add `google-cn` and `apple-cn` lists for custom routing settings due to accessibility in China Mainland
|
- name: Add `google-cn` and `apple-cn` lists for custom routing settings due to accessibility in China Mainland
|
||||||
run: |
|
run: |
|
||||||
curl -sSL $GOOGLE_DOMAINS_URL | perl -ne '/^server=\/([^\/]+)\// && print "$1\n"' > $GOPATH/src/$GEOSITE_REPO/data/google-cn
|
curl -sSL $GOOGLE_DOMAINS_URL | perl -ne '/^server=\/([^\/]+)\// && print "$1\n"' > ./community/data/google-cn
|
||||||
curl -sSL $GOOGLE_DOMAINS_URL | perl -ne '/^server=\/([^\/]+)\// && print "$1\n"' > google-cn.txt
|
curl -sSL $GOOGLE_DOMAINS_URL | perl -ne '/^server=\/([^\/]+)\// && print "$1\n"' > google-cn.txt
|
||||||
curl -sSL $APPLE_DOMAINS_URL | perl -ne '/^server=\/([^\/]+)\// && print "$1\n"' > $GOPATH/src/$GEOSITE_REPO/data/apple-cn
|
curl -sSL $APPLE_DOMAINS_URL | perl -ne '/^server=\/([^\/]+)\// && print "$1\n"' > ./community/data/apple-cn
|
||||||
curl -sSL $APPLE_DOMAINS_URL | perl -ne '/^server=\/([^\/]+)\// && print "$1\n"' > apple-cn.txt
|
curl -sSL $APPLE_DOMAINS_URL | perl -ne '/^server=\/([^\/]+)\// && print "$1\n"' > apple-cn.txt
|
||||||
|
|
||||||
- name: Build geosite.dat file
|
- name: Build geosite.dat file
|
||||||
run: |
|
run: |
|
||||||
domain-list-community --datapath=${{ env.GOPATH }}/src/${{ env.GEOSITE_REPO }}/data
|
cd custom || exit 1
|
||||||
|
go run ./ --datapath=../community/data
|
||||||
|
|
||||||
- name: Move and zip files and generate sha256 hash
|
- name: Move and zip files and generate sha256 hash
|
||||||
run: |
|
run: |
|
||||||
install -Dp geoip.dat ./publish/geoip.dat
|
install -Dp ./geoip/geoip.dat ./publish/geoip.dat
|
||||||
install -Dp dlc.dat ./publish/geosite.dat
|
install -Dp ./custom/publish/dlc.dat ./publish/geosite.dat
|
||||||
install -p {proxy,direct,reject}-tld-list.txt ./publish/
|
install -p {proxy,direct,reject}-tld-list.txt ./publish/
|
||||||
install -p {proxy,direct,reject}-list.txt ./publish/
|
install -p {proxy,direct,reject}-list.txt ./publish/
|
||||||
install -p {apple,google}-cn.txt ./publish/
|
install -p {apple,google}-cn.txt ./publish/
|
||||||
cd ./publish
|
cd ./publish || exit 1
|
||||||
zip rules.zip {proxy,direct,reject}-list.txt geoip.dat geosite.dat
|
zip rules.zip {proxy,direct,reject}-list.txt geoip.dat geosite.dat
|
||||||
sha256sum geoip.dat > geoip.dat.sha256sum
|
sha256sum geoip.dat > geoip.dat.sha256sum
|
||||||
sha256sum geosite.dat > geosite.dat.sha256sum
|
sha256sum geosite.dat > geosite.dat.sha256sum
|
||||||
|
Loading…
Reference in New Issue
Block a user