Compare commits

...

5 Commits

Author SHA1 Message Date
IceCodeNew
0282f7be72 Update build.yml
Add more trigger
2020-04-03 06:50:49 +08:00
IceCodeNew
483696da29 Update build.yml
Change cnipv4url:
https://raw.githubusercontent.com/IceCodeNew/4Share/master/geoip_china/china_ip_list.txt
2020-04-03 06:41:18 +08:00
Loyalsoldier
8352df9737 Update README.md 2020-04-02 23:35:50 +08:00
Loyalsoldier
0dbf14c984 Use IPIP.net CN IPv4 CIDR 2020-04-02 23:24:23 +08:00
Loyalsoldier
52fb8fa3e8 Use geoip project that replaced CN IPv4 CIDR 2020-04-02 23:22:17 +08:00
2 changed files with 9 additions and 6 deletions

View File

@@ -5,21 +5,23 @@ on:
push:
branches:
- master
label:
types: [created, deleted]
jobs:
build:
name: Build
runs-on: ubuntu-latest
steps:
- name: Setup Go 1.14
- name: Setup Go 1.14.1
uses: actions/setup-go@v1
with:
go-version: 1.14
go-version: 1.14.1
- name: Set $GOPATH and more variables
run: |
echo "::set-env name=RELEASE_NAME::Released on $(date +%Y%m%d%H%M)"
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=GEOIP_REPO::github.com/Loyalsoldier/geoip"
echo "::set-env name=GEOSITE_REPO::github.com/v2ray/domain-list-community"
echo "::set-env name=CHINA_DOMAINS_URL::https://raw.githubusercontent.com/felixonmars/dnsmasq-china-list/master/accelerated-domains.china.conf"
echo "::set-env name=GOOGLE_DOMAINS_URL::https://raw.githubusercontent.com/felixonmars/dnsmasq-china-list/master/google.china.conf"
@@ -53,7 +55,7 @@ jobs:
- name: Generate geoip.dat file
run: |
go get -u -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
geoip --country=./geoip/GeoLite2-Country-Locations-en.csv --ipv4=./geoip/GeoLite2-Country-Blocks-IPv4.csv --ipv6=./geoip/GeoLite2-Country-Blocks-IPv6.csv --cnipv4url=https://raw.githubusercontent.com/IceCodeNew/4Share/master/geoip_china/china_ip_list.txt
mkdir -p ./publish
mv ./geoip.dat ./publish/

View File

@@ -10,8 +10,8 @@
### geoip.dat
- 通过仓库 [@v2ray/geoip](https://github.com/v2ray/geoip) 生成
- 其中 IP 地址来源于 [MaxMind GeoLite2](https://dev.maxmind.com/geoip/geoip2/geolite2/)
- 通过仓库 [@Loyalsoldier/geoip](https://github.com/Loyalsoldier/geoip) 生成
- 其中 IP 地址来源于 [MaxMind GeoLite2](https://dev.maxmind.com/geoip/geoip2/geolite2/)`CN` 类别下的 IPv4 地址来源于 [@17mon/china_ip_list](https://github.com/17mon/china_ip_list/blob/master/china_ip_list.txt)
### geosite.dat
@@ -295,6 +295,7 @@
- [@v2ray/geoip](https://github.com/v2ray/geoip)
- [@v2ray/domain-list-community](https://github.com/v2ray/domain-list-community)
- [@17mon/china_ip_list](https://github.com/17mon/china_ip_list/blob/master/china_ip_list.txt)
- [@felixonmars/dnsmasq-china-list](https://github.com/felixonmars/dnsmasq-china-list)
- [@gfwlist/gfwlist](https://github.com/gfwlist/gfwlist)
- [@cokebar/gfwlist2dnsmasq](https://github.com/cokebar/gfwlist2dnsmasq)