Compare commits

..

2 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
2 changed files with 10 additions and 12 deletions

View File

@@ -5,15 +5,17 @@ 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: |
@@ -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 --cnipv4url=https://raw.githubusercontent.com/17mon/china_ip_list/master/china_ip_list.txt
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

@@ -16,7 +16,7 @@
### geosite.dat
- 通过仓库 [@v2ray/domain-list-community](https://github.com/v2ray/domain-list-community) 生成
- **加入大量中国大陆域名、Apple 域名Google 域名**
- **加入大量中国大陆域名、Apple 域名Google 域名和部分海外 CDN 域名**
- [@felixonmars/dnsmasq-china-list/accelerated-domains.china.conf](https://github.com/felixonmars/dnsmasq-china-list/blob/master/accelerated-domains.china.conf) 加入到 `geosite:cn` 类别中
- [@felixonmars/dnsmasq-china-list/apple.china.conf](https://github.com/felixonmars/dnsmasq-china-list/blob/master/apple.china.conf) 加入到 `geosite:geolocation-!cn` 类别中
- [@felixonmars/dnsmasq-china-list/google.china.conf](https://github.com/felixonmars/dnsmasq-china-list/blob/master/google.china.conf) 加入到 `geosite:geolocation-!cn` 类别中
@@ -136,14 +136,12 @@
"loglevel": "warning"
},
"dns": {
"hosts": {
"dns.google": "8.8.8.8"
},
"servers": [
{
"address": "https://1.1.1.1/dns-query",
"domains": [
"geosite:geolocation-!cn"
"geosite:geolocation-!cn",
"geosite:speedtest"
]
},
"https://1.1.1.1/dns-query",
@@ -153,9 +151,6 @@
"port": 53,
"domains": [
"geosite:cn"
],
"expectIPs": [
"geoip:cn"
]
}
]
@@ -247,7 +242,8 @@
"type": "field",
"outboundTag": "Proxy",
"domain": [
"geosite:geolocation-!cn"
"geosite:geolocation-!cn",
"geosite:speedtest"
]
},
{