diff --git a/.github/workflows/build-mosdns.yml b/.github/workflows/build-mosdns.yml index cd5d1189..83ba3453 100644 --- a/.github/workflows/build-mosdns.yml +++ b/.github/workflows/build-mosdns.yml @@ -30,24 +30,24 @@ jobs: repository: loyalsoldier/v2ray-rules-dat ref: release path: dat-release - - name: Checkout mosdns branch + - name: Checkout sub branch uses: actions/checkout@v3 with: ref: mosdns path: mosdns - - name: Clean mosdns branch + - name: Clean sub branch continue-on-error: true run: rm mosdns/* - - name: Rebuild mosdns branch + - name: Rebuild sub 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 - - name: Push to mosdns branch - continue-on-error: true - run: | cd mosdns tar -cf mosdns.tar *.txt rm *.txt + - name: Push to sub branch + continue-on-error: true + run: | git config --global user.name "${GITHUB_ACTOR}" git config --global user.email "${GITHUB_ACTOR}@users.noreply.github.com" git add . diff --git a/.github/workflows/build-net.yml b/.github/workflows/build-net.yml index 266ec39c..75813120 100644 --- a/.github/workflows/build-net.yml +++ b/.github/workflows/build-net.yml @@ -30,17 +30,17 @@ jobs: repository: gaoyifan/china-operator-ip ref: ip-lists path: ip-lists - - name: Checkout net branch + - name: Checkout sub branch uses: actions/checkout@v3 with: ref: net path: net - - name: Clean net branch + - name: Clean sub branch continue-on-error: true run: rm net/* - - name: Rebuild net branch + - name: Rebuild sub branch run: ./exp_net.sh - - name: Push to net branch + - name: Push to sub branch continue-on-error: true run: | cd net diff --git a/.github/workflows/build-sha.yml b/.github/workflows/build-sha.yml index 541670f3..fd1483f7 100644 --- a/.github/workflows/build-sha.yml +++ b/.github/workflows/build-sha.yml @@ -30,25 +30,25 @@ jobs: repository: gaoyifan/china-operator-ip ref: ip-lists path: ip-lists - - name: Checkout sha branch + - name: Checkout sub branch uses: actions/checkout@v3 with: ref: sha path: sha - - name: Clean sha branch + - name: Clean sub branch continue-on-error: true run: rm sha/* - - name: Rebuild sha branch + - name: Rebuild sub 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' - - name: Push to sha branch - continue-on-error: true - run: | cd sha chmod +x *.sh tar -cf sha.tar *.sh rm *.sh + - name: Push to sub branch + continue-on-error: true + run: | git config --global user.name "${GITHUB_ACTOR}" git config --global user.email "${GITHUB_ACTOR}@users.noreply.github.com" git add .