From 21f766dc39d27f8d34cbe978d97c28921d520189 Mon Sep 17 00:00:00 2001 From: Loyalsoldier Date: Tue, 31 Dec 2019 22:39:50 +0800 Subject: [PATCH] Update for new GeoLite2 policy --- .github/workflows/build.yml | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f877c982..03002ae0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,23 +39,17 @@ jobs: with: ref: hidden -# - name: Get GeoLite2 file -# run: | -# curl -sSL -O https://geolite.maxmind.com/download/geoip/database/GeoLite2-Country-CSV.zip -# unzip GeoLite2-Country-CSV.zip -# rm -f GeoLite2-Country-CSV.zip -# mv GeoLite2* geoip - -# - 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 -# mkdir -p ./publish -# mv ./geoip.dat ./publish/ - - - name: Copy geoip.dat + - name: Get GeoLite2 file run: | - curl -sSL -O https://github.com/Loyalsoldier/v2ray-rules-dat/raw/master/geoip.dat + curl -sSL -o GeoLite2-Country-CSV.zip https://download.maxmind.com/app/geoip_download?edition_id=GeoLite2-Country-CSV&license_key=JvbzLLx7qBZT&suffix=zip + unzip GeoLite2-Country-CSV.zip + rm -f GeoLite2-Country-CSV.zip + mv GeoLite2* geoip + + - 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 mkdir -p ./publish mv ./geoip.dat ./publish/