mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-03-09 15:40:03 +00:00
Code Issues Releases Wiki Activity

Revert "Merge branch 'test' into develop"

Browse source 
This reverts commit c36b89f63c, reversing
changes made to 47f95a6a3f.
This commit is contained in:
suyuan 2022-11-20 01:53:22 +08:00
parent c36b89f63c
commit 6f62379a8a
2 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

24
.github/workflows/main.yml vendored
View file

@ -2,13 +2,13 @@ name: openmptcprouter
on: [push] on: [push]
env: env:
REPO_URL: 'https://github.com/ysurac/openmptcprouter' REPO_URL: 'https://github.com/suyuan168/3grouter'
jobs: jobs:
build: build:
strategy: strategy:
matrix: matrix:
OMR_TARGET: [bpi-r1, bpi-r2, bpi-r64, rpi2, rpi4, wrt32x, espressobin, r2s, rpi3, wrt3200acm, x86, x86_64, ubnt-erx, r4s, r7800, rutx, r5s] OMR_TARGET: [bpi-r1, bpi-r2, bpi-r64, rpi2, rpi4, wrt32x, espressobin, r2s, rpi3, wrt3200acm, cm520-79f, x86_64, ubnt-erx, r4s, r7800, rutx, l1000, zbt4019]
OMR_KERNEL: [5.4, 5.15] OMR_KERNEL: [5.4, 5.15]
runs-on: ubuntu-latest runs-on: ubuntu-latest
continue-on-error: true continue-on-error: true
@ -39,7 +39,7 @@ jobs:
- name: Clone source code - name: Clone source code
working-directory: ../../ working-directory: ../../
env: env:
REPO_URL: https://github.com/ysurac/openmptcprouter REPO_URL: https://github.com/suyuan168/3grouter
SOURCE_NAME: ${{ steps.branch_name.outputs.SOURCE_NAME }} SOURCE_NAME: ${{ steps.branch_name.outputs.SOURCE_NAME }}
GITHUB_WORKSPACE: ${{ steps.branch_name.outputs.WORKSPACE }} GITHUB_WORKSPACE: ${{ steps.branch_name.outputs.WORKSPACE }}
run: | run: |
@ -58,7 +58,7 @@ jobs:
- name: Build toolchain - name: Build toolchain
working-directory: ../../omr working-directory: ../../omr
env: env:
OMR_FEED_URL: https://github.com/ysurac/openmptcprouter-feeds OMR_FEED_URL: https://github.com/suyuan168/openmptcprouter-feeds
SOURCE_NAME: ${{ steps.branch_name.outputs.SOURCE_NAME }} SOURCE_NAME: ${{ steps.branch_name.outputs.SOURCE_NAME }}
OMR_TARGET: ${{ matrix.OMR_TARGET }} OMR_TARGET: ${{ matrix.OMR_TARGET }}
OMR_KERNEL: ${{ matrix.OMR_KERNEL }} OMR_KERNEL: ${{ matrix.OMR_KERNEL }}
@ -96,9 +96,9 @@ jobs:
SOURCE_TAG: ${{ steps.branch_name.outputs.SOURCE_TAG }} SOURCE_TAG: ${{ steps.branch_name.outputs.SOURCE_TAG }}
with: with:
command: | command: |
mkdir -p deploy/release/${{env.SOURCE_TAG}}/${{matrix.OMR_TARGET}} mkdir -p /www/wwwroot/55860.com/bak/down/release/${{env.SOURCE_TAG}}/${{matrix.OMR_TARGET}}
host: ${{ secrets.OMR_DEPLOY_HOST }} host: ${{ secrets.OMR_DEPLOY_HOST }}
user: deploy user: root
port: ${{ secrets.OMR_DEPLOY_PORT }} port: ${{ secrets.OMR_DEPLOY_PORT }}
key: ${{ secrets.PRIVATE_KEY }} key: ${{ secrets.PRIVATE_KEY }}
args: -tt args: -tt
@ -111,9 +111,9 @@ jobs:
SOURCE_TAG: ${{ steps.branch_name.outputs.SOURCE_TAG }} SOURCE_TAG: ${{ steps.branch_name.outputs.SOURCE_TAG }}
with: with:
command: | command: |
mkdir -p deploy/${{env.SOURCE_BRANCH}}/${{matrix.OMR_KERNEL}}/${{matrix.OMR_TARGET}} mkdir -p /www/wwwroot/55860.com/bak/down/${{env.SOURCE_BRANCH}}/${{matrix.OMR_KERNEL}}/${{matrix.OMR_TARGET}}
host: ${{ secrets.OMR_DEPLOY_HOST }} host: ${{ secrets.OMR_DEPLOY_HOST }}
user: deploy user: root
port: ${{ secrets.OMR_DEPLOY_PORT }} port: ${{ secrets.OMR_DEPLOY_PORT }}
key: ${{ secrets.PRIVATE_KEY }} key: ${{ secrets.PRIVATE_KEY }}
args: -tt args: -tt
@ -130,10 +130,10 @@ jobs:
uses: ysurac/action-rsync@master uses: ysurac/action-rsync@master
env: env:
ARGS: -av --delete-after ARGS: -av --delete-after
TARGET: deploy/release/${{steps.branch_name.outputs.SOURCE_TAG}}/${{matrix.OMR_TARGET}} TARGET: /www/wwwroot/55860.com/bak/down/release/${{steps.branch_name.outputs.SOURCE_TAG}}/${{matrix.OMR_TARGET}}
SOURCE: ./bin/ SOURCE: ./bin/
KEY: ${{ secrets.PRIVATE_KEY }} KEY: ${{ secrets.PRIVATE_KEY }}
USER: deploy USER: root
HOST: ${{ secrets.OMR_DEPLOY_HOST }} HOST: ${{ secrets.OMR_DEPLOY_HOST }}
PORT: ${{ secrets.OMR_DEPLOY_PORT }} PORT: ${{ secrets.OMR_DEPLOY_PORT }}
SOURCE_NAME: ${{ steps.branch_name.outputs.SOURCE_NAME }} SOURCE_NAME: ${{ steps.branch_name.outputs.SOURCE_NAME }}
@ -145,10 +145,10 @@ jobs:
uses: ysurac/action-rsync@master uses: ysurac/action-rsync@master
env: env:
ARGS: -av --delete-after ARGS: -av --delete-after
TARGET: deploy/${{ steps.branch_name.outputs.SOURCE_BRANCH }}/${{matrix.OMR_KERNEL}}/${{matrix.OMR_TARGET}} TARGET: /www/wwwroot/55860.com/bak/down/${{ steps.branch_name.outputs.SOURCE_BRANCH }}/${{matrix.OMR_KERNEL}}/${{matrix.OMR_TARGET}}
SOURCE: ./bin/ SOURCE: ./bin/
KEY: ${{ secrets.PRIVATE_KEY }} KEY: ${{ secrets.PRIVATE_KEY }}
USER: deploy USER: root
HOST: ${{ secrets.OMR_DEPLOY_HOST }} HOST: ${{ secrets.OMR_DEPLOY_HOST }}
PORT: ${{ secrets.OMR_DEPLOY_PORT }} PORT: ${{ secrets.OMR_DEPLOY_PORT }}
SOURCE_NAME: ${{ steps.branch_name.outputs.SOURCE_NAME }} SOURCE_NAME: ${{ steps.branch_name.outputs.SOURCE_NAME }}

4
mptcp/files/usr/share/omr/post-tracking.d/post-tracking
View file

@ -1704,11 +1704,9 @@ if [ -f /etc/init.d/omr-bypass ] && (([ -f /usr/sbin/iptables-legacy-save ] && [
sleep 5 sleep 5
fi fi
if [ -f /etc/backup/installed_packages.txt ] && [ -n "$(grep overlay /etc/backup/installed_packages.txt)" ] && ([ "$(uci -q get openmptcprouter.settings.sysupgrade_lc)" = "" ] || [ $(($(date +"%s") + $((30 + RANDOM % 31)) - $(uci -q get openmptcprouter.settings.sysupgrade_lc))) -gt 3600 ]) && [ $(($(date +"%s") - $(stat -c "%Y" /etc/backup/installed_packages.txt))) -gt 86400 ]; then if [ -f /etc/backup/installed_packages.txt ] && [ -n "$(grep overlay /etc/backup/installed_packages.txt)" ]; then
_log "Reinstall packages..." _log "Reinstall packages..."
uci -q set openmptcprouter.settings.sysupgrade_lc=$(date +"%s")
/etc/init.d/sysupgrade restart 2>&1 >/dev/null /etc/init.d/sysupgrade restart 2>&1 >/dev/null
sleep 10
fi fi
if [ "$(pgrep openmptcprouter-vps)" = "" ] && [ "$(uci -q show openmptcprouter | grep token_error=\'1\')" != "" ]; then if [ "$(pgrep openmptcprouter-vps)" = "" ] && [ "$(uci -q show openmptcprouter | grep token_error=\'1\')" != "" ]; then