mirror of
https://github.com/darkclip/netlist.git
synced 2026-11-12 11:05:44 +08:00
update
This commit is contained in:
darkclip committed
1 parent
ed2225895b
commit
4b6287baed
6 files changed
+145
-180
No files matched your search
@@ -1,13 +1,13 @@
|
||||
name: build mosdns
|
||||
name: build-mosdns
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- 'master'
|
||||
paths:
|
||||
- '.github/workflows/**'
|
||||
- '.github/workflows/build-mosdns.yml'
|
||||
schedule:
|
||||
- cron: '10 16 * * *'
|
||||
- cron: '0 16 * * *'
|
||||
|
||||
jobs:
|
||||
build-mosdns:
|
||||
@@ -24,28 +24,28 @@ jobs:
|
||||
run: |
|
||||
python -m pip install --upgrade pip
|
||||
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
|
||||
- name: Check out release branch of loyalsoldier/v2ray-rules-dat
|
||||
- name: Check out reference branch
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
repository: loyalsoldier/v2ray-rules-dat
|
||||
ref: release
|
||||
path: dat-release
|
||||
- name: Checkout sub branch
|
||||
path: ref
|
||||
- name: Checkout target branch
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
ref: mosdns
|
||||
path: mosdns
|
||||
- name: Clean sub branch
|
||||
path: target
|
||||
- name: Clean target branch
|
||||
continue-on-error: true
|
||||
run: rm mosdns/*
|
||||
- name: Rebuild sub branch
|
||||
run: rm target/*
|
||||
- name: Rebuild target branch
|
||||
run: |
|
||||
./raydata.py dat-release/geoip.dat -c cn -o mosdns/chinaip.txt geoip
|
||||
./raydata.py dat-release/geosite.dat -c cn -o mosdns/chinasite.txt geosite --formatter format_mosdns.json
|
||||
cd mosdns
|
||||
./raydata.py ref/geoip.dat -c cn -o target/chinaip.txt geoip
|
||||
./raydata.py ref/geosite.dat -c cn -o target/chinasite.txt geosite --formatter format_mosdns.json
|
||||
cd target
|
||||
tar -cf mosdns.tar *.txt
|
||||
rm *.txt
|
||||
- name: Push to sub branch
|
||||
- name: Push to target branch
|
||||
continue-on-error: true
|
||||
run: |
|
||||
git config --global user.name "${GITHUB_ACTOR}"
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
name: build net
|
||||
name: build-net
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- 'master'
|
||||
paths:
|
||||
- '.github/workflows/**'
|
||||
- '.github/workflows/build-net.yml'
|
||||
schedule:
|
||||
- cron: '0 16 * * *'
|
||||
|
||||
@@ -24,27 +24,45 @@ jobs:
|
||||
run: |
|
||||
python -m pip install --upgrade pip
|
||||
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
|
||||
- name: Check out ip-lists branch of gaoyifan/china-operator-ip
|
||||
- name: Check out reference branch
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
repository: gaoyifan/china-operator-ip
|
||||
ref: ip-lists
|
||||
path: ip-lists
|
||||
- name: Checkout sub branch
|
||||
path: ref
|
||||
- name: Checkout target branch
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
ref: net
|
||||
path: net
|
||||
- name: Clean sub branch
|
||||
path: target
|
||||
- name: Clean target branch
|
||||
continue-on-error: true
|
||||
run: rm net/*
|
||||
- name: Rebuild sub branch
|
||||
run: ./exp_net.sh
|
||||
- name: Push to sub branch
|
||||
run: rm target/*
|
||||
- name: Rebuild target branch
|
||||
run: |
|
||||
./netgen.py ref/china.txt -o target/china.txt
|
||||
./netgen.py ref/china6.txt -o target/china6.txt
|
||||
|
||||
./netgen.py ref/chinanet.txt -o target/telecom.txt
|
||||
./netgen.py ref/chinanet6.txt -o target/telecom6.txt
|
||||
|
||||
./netgen.py ref/unicom.txt -o target/unicom.txt
|
||||
./netgen.py ref/unicom6.txt -o target/unicom6.txt
|
||||
|
||||
./netgen.py ref/china.txt -e ref/chinanet.txt ref/unicom.txt -o target/others.txt
|
||||
./netgen.py ref/china6.txt -e ref/chinanet6.txt ref/unicom6.txt -o target/others6.txt
|
||||
|
||||
./netgen.py 0.0.0.0/0 -e private.txt ref/china.txt -o target/foreign.txt
|
||||
./netgen.py ::/0 -e private6.txt ref/china6.txt -o target/foreign6.txt
|
||||
|
||||
./netgen.py private.txt -o target/private.txt
|
||||
./netgen.py private6.txt -o target/private6.txt
|
||||
|
||||
cd target
|
||||
tree -H . -P "*.txt" -T "IP List - $(date +%Y-%m-%d)" > index.html
|
||||
- name: Push to target branch
|
||||
continue-on-error: true
|
||||
run: |
|
||||
cd net
|
||||
tree -H . -P "*.txt" -T "IP List - $(date +%Y-%m-%d)" > index.html
|
||||
git config --global user.name "${GITHUB_ACTOR}"
|
||||
git config --global user.email "${GITHUB_ACTOR}@users.noreply.github.com"
|
||||
git add .
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
name: build sha
|
||||
name: build-sha
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- 'master'
|
||||
paths:
|
||||
- '.github/workflows/**'
|
||||
- '.github/workflows/build-sha.yml'
|
||||
schedule:
|
||||
- cron: '20 16 * * *'
|
||||
- cron: '0 16 * * *'
|
||||
|
||||
jobs:
|
||||
build-sha:
|
||||
@@ -24,29 +24,31 @@ jobs:
|
||||
run: |
|
||||
python -m pip install --upgrade pip
|
||||
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
|
||||
- name: Check out ip-lists branch of gaoyifan/china-operator-ip
|
||||
- name: Check out reference branch
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
repository: gaoyifan/china-operator-ip
|
||||
ref: ip-lists
|
||||
path: ip-lists
|
||||
- name: Checkout sub branch
|
||||
path: ref
|
||||
- name: Checkout target branch
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
ref: sha
|
||||
path: sha
|
||||
- name: Clean sub branch
|
||||
path: target
|
||||
- name: Clean target branch
|
||||
continue-on-error: true
|
||||
run: rm sha/*
|
||||
- name: Rebuild sub branch
|
||||
run: rm target/*
|
||||
- name: Rebuild target branch
|
||||
run: |
|
||||
./netgen.py ip-lists/china.txt -o sha/china.sh -p 'ip route add ' -s $' dev eth0 via 10.11.0.1 || true\n'
|
||||
./netgen.py ip-lists/china6.txt -o sha/china6.sh -p 'ip route add ' -s $' dev eth0 via fe80::6a77:24ff:fed6:809d || true\n'
|
||||
cd sha
|
||||
./netgen.py ref/china.txt -o target/china.sh -p 'ip route add ' -s $' dev eth0 via 10.11.0.1 || true\n'
|
||||
./netgen.py ref/china6.txt -o target/china6.sh -p 'ip route add ' -s $' dev eth0 via fe80::6a77:24ff:fed6:809d || true\n'
|
||||
./netgen.py ref/china.txt -o target/rm-china.sh -p 'ip route del ' -s $' dev eth0 via 10.11.0.1 || true\n'
|
||||
./netgen.py ref/china6.txt -o target/rm-china6.sh -p 'ip route del ' -s $' dev eth0 via fe80::6a77:24ff:fed6:809d || true\n'
|
||||
cd target
|
||||
chmod +x *.sh
|
||||
tar -cf sha.tar *.sh
|
||||
rm *.sh
|
||||
- name: Push to sub branch
|
||||
- name: Push to target branch
|
||||
continue-on-error: true
|
||||
run: |
|
||||
git config --global user.name "${GITHUB_ACTOR}"
|
||||
|
||||
Reference in new issue
Block a user