Use geo for conversions

This commit is contained in:
H1JK 2023-07-18 11:35:34 +08:00
parent db629c216b
commit 48d8c10b7e

View File

@ -13,12 +13,13 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Setup Go - name: Setup Go
uses: actions/setup-go@v3 uses: actions/setup-go@v4
with: with:
go-version: 'stable' go-version: 'stable'
- name: Set variables - name: Set variables
run: | run: |
echo "GOAMD64=v3" >> $GITHUB_ENV
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 "BUILDTIME=$(TZ=Asia/Shanghai date +"%A %B %d, %Y %H:%M")" >> $GITHUB_ENV echo "BUILDTIME=$(TZ=Asia/Shanghai date +"%A %B %d, %Y %H:%M")" >> $GITHUB_ENV
echo "BUILDTIMECN=$(TZ=Asia/Shanghai date +"%Y年%m月%d日 %H时%M分")" >> $GITHUB_ENV echo "BUILDTIMECN=$(TZ=Asia/Shanghai date +"%Y年%m月%d日 %H时%M分")" >> $GITHUB_ENV
@ -199,33 +200,17 @@ jobs:
wget -O geoip-lite.dat https://github.com/xishang0128/geoip/raw/release/geoip.dat wget -O geoip-lite.dat https://github.com/xishang0128/geoip/raw/release/geoip.dat
wget https://github.com/Loyalsoldier/geoip/raw/release/geoip.dat wget https://github.com/Loyalsoldier/geoip/raw/release/geoip.dat
- name: Build db file - name: Build db and metadb file
env: env:
NO_SKIP: true NO_SKIP: true
run: | run: |
mkdir -p v2box go install -trimpath -ldflags="-s -w -buildid=" github.com/metacubex/geo/cmd/geo@master
cd v2box || exit 1 geo convert site -i v2ray -o sing -f geosite.db ./custom/publish/geosite.dat
wget https://github.com/xishang0128/meta-rules-dat/releases/download/v2box/v2box geo convert site -i v2ray -o sing -f geosite-lite.db ./community/geosite-lite.dat
chmod 755 v2box geo convert ip -i v2ray -o sing -f geoip.db ./geoip.dat
./v2box migrate geosite -i ../custom/publish/geosite.dat -o ./geosite.db geo convert ip -i v2ray -o meta -f geoip.metadb ./geoip.dat
./v2box migrate geosite -i ../community/geosite-lite.dat -o ./geosite-lite.db geo convert ip -i v2ray -o sing -f geoip-lite.db ./geoip-lite.dat
./v2box migrate geoip -i ../geoip.dat -o ./geoip.db geo convert ip -i v2ray -o meta -f geoip-lite.metadb ./geoip-lite.dat
# ./v2box migrate geoip -i ../geoip-lite.dat -o ./geoip-lite.db
- name: Checkout SagerNet/sing-geoip
uses: actions/checkout@v3
with:
repository: SagerNet/sing-geoip
path: sing-geoip
- name: Build geoip.db file
env:
NO_SKIP: true
run: |
cd sing-geoip || exit 1
sed -i 's/Dreamacro\/maxmind-geoip/xishang0128\/geoip/g' main.go
go run -v .
mv geoip.db geoip-lite.db
- name: Move and zip files - name: Move and zip files
run: | run: |
@ -236,17 +221,19 @@ jobs:
install -Dp ./geoip.dat ./publish/ install -Dp ./geoip.dat ./publish/
install -Dp ./custom/publish/geosite.dat ./publish/ install -Dp ./custom/publish/geosite.dat ./publish/
install -Dp ./community/geosite-lite.dat ./publish/ install -Dp ./community/geosite-lite.dat ./publish/
install -Dp ./v2box/geosite.db ./publish/ install -Dp ./geosite.db ./publish/
install -Dp ./v2box/geosite-lite.db ./publish/ install -Dp ./geosite-lite.db ./publish/
install -Dp ./v2box/geoip.db ./publish/ install -Dp ./geoip.db ./publish/
install -Dp ./sing-geoip/geoip-lite.db ./publish/ install -Dp ./geoip-lite.db ./publish/
install -Dp ./geoip.metadb ./publish/
install -Dp ./geoip-lite.metadb ./publish/
curl -sSL https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/rule/Clash/ChinaMax/ChinaMax_Domain.yaml | sed '/^\s*#/d' > ./publish/cn_domain.yaml curl -sSL https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/rule/Clash/ChinaMax/ChinaMax_Domain.yaml | sed '/^\s*#/d' > ./publish/cn_domain.yaml
curl -sSL https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/rule/Clash/Proxy/Proxy_Domain.yaml | sed '/^\s*#/d' > ./publish/proxy.yaml curl -sSL https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/rule/Clash/Proxy/Proxy_Domain.yaml | sed '/^\s*#/d' > ./publish/proxy.yaml
curl -sSL https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/rule/Clash/ChinaMax/ChinaMax_Classical.yaml | grep DOMAIN | grep -v "#" | sed 's/ - DOMAIN,/full:/g' | sed 's/ - DOMAIN-SUFFIX,//g' | sed 's/ - DOMAIN-KEYWORD,/keyword:/g' > ./publish/cn.txt curl -sSL https://raw.githubusercontent.com/blackmatrix7/ios_rule_script/master/rule/Clash/ChinaMax/ChinaMax_Classical.yaml | grep DOMAIN | grep -v "#" | sed 's/ - DOMAIN,/full:/g' | sed 's/ - DOMAIN-SUFFIX,//g' | sed 's/ - DOMAIN-KEYWORD,/keyword:/g' > ./publish/cn.txt
cd ./publish || exit 1 cd ./publish || exit 1
- name: Delete current release assets - name: Delete current release assets
uses: andreaswilli/delete-release-assets-action@v2.0.0 uses: andreaswilli/delete-release-assets-action@v3.0.0
with: with:
github_token: ${{ secrets.GITHUB_TOKEN }} github_token: ${{ secrets.GITHUB_TOKEN }}
tag: latest tag: latest