yanistyle/nanopi-openwrt-r1s-h3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update r2s_lienol.yml

Browse Source
This commit is contained in:
klever1988
2020-03-01 08:52:41 +08:00
committed by GitHub
parent f8b193bd85
commit 22170c684d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/r2s_lienol.yml vendored
View File

@@ -65,11 +65,12 @@ jobs:
git config --local user.email "action@github.com" && git config --local user.name "GitHub Action"
git remote add upstream https://github.com/Lienol/openwrt && git fetch upstream
git checkout upstream/dev-19.07 -b tmp
sed -i '/ucl upx/d' tools/Makefile && git add tools/Makefile
git mv README.md README && git commit -m 'undo rename readme for rebasing'
git checkout origin/master-v19.07.1
git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto tmp -X theirs
git revert --no-edit f092ca098e80c667b10cdd1dba328506a2673c1d
git checkout upstream/dev-19.07 -- feeds.conf.default
sed -i '/ucl upx/d' tools/Makefile
sed -i '/exit/i\chown -R root:root /usr/share/netdata/web' package/default-settings/files/zzz-default-settings
#sed -i 's/option fullcone\t1/option fullcone\t0/' package/network/config/firewall/files/firewall.config
sed -i '/8.8.8.8/d' package/base-files/files/root/setup.sh