Compare commits

..

6 Commits

Author SHA1 Message Date
IceCodeNew
71a1b27b1d Update build.yml 2020-06-21 16:44:49 +08:00
IceCodeNew
d2a7ba82bb Merge remote-tracking branch 'upstream/master' 2020-06-21 15:46:06 +08:00
Loyalsoldier
ad1e85a29b Update go version to match semver 2020-06-21 14:06:09 +08:00
dependabot[bot]
3c628e3b8a Bump actions/checkout from v2.3.0 to v2.3.1 (#33)
Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-19 13:50:03 +08:00
dependabot[bot]
f011257460 Bump actions/checkout from v2 to v2.3.0 (#32)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-06-17 09:59:25 +08:00
Loyalsoldier
16c4c667c5 Update README.md
To meet attribution requirement of MaxMind GeoLite2
2020-06-13 16:20:08 +08:00
2 changed files with 8 additions and 6 deletions

View File

@@ -13,10 +13,10 @@ jobs:
name: Build
runs-on: ubuntu-latest
steps:
- name: Setup Go 1.14
- name: Setup Go 1.x
uses: actions/setup-go@v2
with:
go-version: 1.14
go-version: "^1.14"
- name: Set $GOPATH and more variables
run: |
@@ -25,7 +25,6 @@ jobs:
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=ICN_RULES_DIRECT_URL::https://raw.githubusercontent.com/IceCodeNew/4Share/master/Proxifier/GetWhiteDomainLists/whitelist.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"
@@ -41,13 +40,14 @@ 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=ICN_RULES_DIRECT_URL::https://raw.githubusercontent.com/IceCodeNew/4Share/master/Proxifier/GetWhiteDomainLists/whitelist.txt"
echo "::set-env name=ICN_RULES_REJECT_URL::https://raw.githubusercontent.com/IceCodeNew/4Share/master/DNSCrypt/mybase.txt"
echo "::set-env name=GOPATH::$(dirname $GITHUB_WORKSPACE)"
echo "::add-path::$(dirname $GITHUB_WORKSPACE)/bin"
shell: bash
- name: Checkout the "hidden" branch
uses: actions/checkout@v2
uses: actions/checkout@v2.3.1
with:
ref: hidden
@@ -70,7 +70,7 @@ jobs:
- name: Get and add direct domains into temp-direct.txt file
run: |
curl -sSL $CHINA_DOMAINS_URL | perl -ne '/^server=\/([^\/]+)\// && print "$1\n"' > temp-direct.txt
curl -sSL $ICN_RULES_DIRECT_URL | sed -E 's/^\*\.//g' >> temp-direct.txt
curl -sSL $ICN_RULES_DIRECT_URL | sed -E -e '/^#|^$/d' -e 's/\*\.//g' >> temp-reject.txt
- name: Get and add proxy domains into temp-proxy.txt file
run: |

View File

@@ -336,6 +336,9 @@ scoop install v2ray-rules-dat
## 致谢
> This product includes GeoLite2 data created by MaxMind, available from [https://www.maxmind.com](https://www.maxmind.com).
- [MaxMind GeoLite2 Free IP Database](https://dev.maxmind.com/geoip/geoip2/geolite2/)
- [@kidonng/scoop-v2ray](https://github.com/kidonng/scoop-v2ray)
- [@v2ray/geoip](https://github.com/v2ray/geoip)
- [@v2ray/domain-list-community](https://github.com/v2ray/domain-list-community)
@@ -350,7 +353,6 @@ scoop install v2ray-rules-dat
- [@GeQ1an/Rules](https://github.com/GeQ1an/Rules/tree/master/QuantumultX)
- [@lhie1/Rules](https://github.com/lhie1/Rules/tree/master)
- [@AdAway/adaway.github.io/hosts.txt](https://github.com/AdAway/adaway.github.io/blob/master/hosts.txt)
- [MaxMind GeoLite2 Free IP Database](https://dev.maxmind.com/geoip/geoip2/geolite2/)
## 项目 Star 数增长趋势